Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop

4 files changed, 20 insertions, 0 deletions

diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 9d967841..6b3d9919 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -4,4 +4,11 @@ class site_apt::leap_repo {
     before  => Exec[refresh_apt]
   }
 
+  package { 'leap-keyring':
+    ensure => latest
+  }
+
+  # We wont be able to install the leap-keyring package unless the leap apt
+  # source has been added and apt has been refreshed
+  Exec['refresh_apt'] -> Package['leap-keyring']
 }
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 7758a69d..cfb46130 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -36,4 +36,6 @@ class site_config::default {
 
   Class['git'] -> Vcsrepo<||>
 
+  # include basic shell config
+  include site_config::shell
 }
diff --git a/puppet/modules/site_config/manifests/shell.pp b/puppet/modules/site_config/manifests/shell.pp
new file mode 100644
index 00000000..b1a65389
--- /dev/null
+++ b/puppet/modules/site_config/manifests/shell.pp
@@ -0,0 +1,10 @@
+class site_config::shell {
+
+  file {
+    '/etc/profile.d/leap_path.sh':
+      content => 'PATH=$PATH:/srv/leap/bin',
+      mode    => '0644',
+      owner   => root,
+      group   => root;
+  }
+}
diff --git a/puppet/modules/site_shorewall/manifests/webapp.pp b/puppet/modules/site_shorewall/manifests/webapp.pp
index d12bbc8f..a8d2aa5b 100644
--- a/puppet/modules/site_shorewall/manifests/webapp.pp
+++ b/puppet/modules/site_shorewall/manifests/webapp.pp
@@ -2,5 +2,6 @@ class site_shorewall::webapp {
 
   include site_shorewall::defaults
   include site_shorewall::service::https
+  include site_shorewall::service::http
   include site_shorewall::service::webapp_api
 }