From 400dde54f3950ad01d716b664d2ed1a236b8ca42 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 11 Jun 2013 15:00:36 -0400 Subject: add a class site_config::shell for shell-related configurations setup a /etc/profile.d configuration snippet to put /srv/leap/bin in the $PATH (#2122) Change-Id: I0afb5232375e6c6d9f692a97243023c710265d54 --- puppet/modules/site_config/manifests/default.pp | 2 ++ puppet/modules/site_config/manifests/shell.pp | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 puppet/modules/site_config/manifests/shell.pp 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; + } +} -- cgit v1.2.3 From d10240be7ac7116e86cee32f5b8d5b90768e7094 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 12 Jun 2013 14:01:24 -0400 Subject: webapp should be available over http so a proper redirect can be done to https without this rule, one just gets a 'site is unavailable' result Change-Id: I27b80a0044e9fe4e87e607412c8d0a089d4866a6 --- puppet/modules/site_shorewall/manifests/webapp.pp | 1 + 1 file changed, 1 insertion(+) 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 } -- cgit v1.2.3 From 03cb737490a12813b63801bbf9198e7e4a91a37b Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 13 Jun 2013 16:54:56 -0400 Subject: install the leap-keyring package, after the leap apt source has been added and apt has been refreshed Change-Id: I485420c4ea50f8c3f6699b9b8073dc6c67b7a353 --- puppet/modules/site_apt/manifests/leap_repo.pp | 7 +++++++ 1 file changed, 7 insertions(+) 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'] } -- cgit v1.2.3