Merge branch 'feature/static_site' of https://github.com/elijh/leap_platform into elijh-feature/static_site

Conflicts:
	puppet/modules/site_config/manifests/packages/base.pp

5 files changed, 31 insertions, 17 deletions

diff --git a/puppet/modules/site_config/manifests/packages/base.pp b/puppet/modules/site_config/manifests/packages/base.pp
index 9f802771..ae47963c 100644
--- a/puppet/modules/site_config/manifests/packages/base.pp
+++ b/puppet/modules/site_config/manifests/packages/base.pp
@@ -1,6 +1,5 @@
 class site_config::packages::base {
 
-  include site_config::params
 
   # base set of packages that we want to have installed everywhere
   package { [ 'etckeeper', 'screen', 'less', 'ntp' ]:
@@ -16,20 +15,4 @@ class site_config::packages::base {
               'x11-utils', 'xterm' ]:
     ensure => absent;
   }
-
-  if $::site_config::params::environment == 'local'
-    or $::services =~ /\bwebapp\b/
-    or $::services =~ /\bcouchdb\b/ {
-      $dev_packages_ensure = present
-  } else {
-      $dev_packages_ensure = absent
-  }
-
-  # g++ and ruby1.9.1-dev are needed for nickserver/eventmachine (#4079)
-  # dev_packages are needed for building gems on the webapp node
-
-  package { [ 'build-essential', 'g++', 'g++-4.7', 'gcc',
-              'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
-    ensure => $dev_packages_ensure
-  }
 }
diff --git a/puppet/modules/site_config/manifests/packages/build_essential.pp b/puppet/modules/site_config/manifests/packages/build_essential.pp
new file mode 100644
index 00000000..c9efaafb
--- /dev/null
+++ b/puppet/modules/site_config/manifests/packages/build_essential.pp
@@ -0,0 +1,8 @@
+#
+# include this whenever you want to ensure build-essential package and related compilers are installed.
+#
+class site_config::packages::build_essential {
+  if $install_build_essential == undef {
+    $install_build_essential = true
+  }
+}
\ No newline at end of file
diff --git a/puppet/modules/site_config/manifests/packages/uninstall.pp b/puppet/modules/site_config/manifests/packages/uninstall.pp
new file mode 100644
index 00000000..2919cc96
--- /dev/null
+++ b/puppet/modules/site_config/manifests/packages/uninstall.pp
@@ -0,0 +1,20 @@
+#
+# this should be included last to allow other modules to set $::install_build_packages
+#
+class site_config::packages::uninstall {
+
+  if $site_config::packages::build_essential::install_essential == true {
+    $dev_packages_ensure = present
+  } else {
+    $dev_packages_ensure = absent
+  }
+
+  # generally, dev packages are needed for installing ruby gems with native extensions.
+  # (nickserver, webapp, etc)
+
+  package { [ 'build-essential', 'g++', 'g++-4.7', 'gcc',
+              'gcc-4.6', 'gcc-4.7', 'cpp', 'cpp-4.6', 'cpp-4.7', 'libc6-dev' ]:
+    ensure => $dev_packages_ensure
+  }
+
+}
\ No newline at end of file
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index 5bdc0077..012b3ce0 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -8,6 +8,7 @@ class site_config::params {
 
   if $environment == 'local' {
     $interface = 'eth1'
+    include site_config::packages::build_essential
   }
   elsif hiera('interface','') != '' {
     $interface = hiera('interface')
diff --git a/puppet/modules/site_config/manifests/ruby/dev.pp b/puppet/modules/site_config/manifests/ruby/dev.pp
index dbc77ae7..3ea6ca96 100644
--- a/puppet/modules/site_config/manifests/ruby/dev.pp
+++ b/puppet/modules/site_config/manifests/ruby/dev.pp
@@ -3,4 +3,6 @@ class site_config::ruby::dev inherits site_config::ruby {
     ruby_version => '1.9.3',
     install_dev  => true
   }
+  # building gems locally probably requires build-essential and gcc:
+  include site_config::packages::build_essential
 }