From 3c41a81f1a3e1757ea6b9bda7e1a98dce624ec1d Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 1 Apr 2013 00:05:42 -0700
Subject: added setup.pp

---
 puppet/modules/site_config/manifests/hosts.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_config/manifests/hosts.pp')

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 6c00f3b6..81795f7d 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -1,9 +1,8 @@
 class site_config::hosts() {
-
   $hosts = hiera('hosts','')
   $hostname = hiera('name')
-
-  $domain_public = $site_config::default::domain_hash['full_suffix']
+  $domain_hash = hiera('domain')
+  $domain_public = $domain_hash['full_suffix']
 
   file { "/etc/hostname":
     ensure => present,
-- 
cgit v1.2.3


From c849ef699d6426b3161f901eea625247cdefbef5 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 2 Apr 2013 16:41:06 -0400
Subject: fix variable curly braces

---
 puppet/modules/site_config/manifests/hosts.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_config/manifests/hosts.pp')

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 81795f7d..1e1590f5 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -9,7 +9,7 @@ class site_config::hosts() {
     content => $hostname
   }
 
-  exec { "/bin/hostname $hostname":
+  exec { "/bin/hostname ${hostname}":
     subscribe   => [ File['/etc/hostname'], File['/etc/hosts'] ],
     refreshonly => true;
   }
-- 
cgit v1.2.3


From 14bd8cf734fec65d4f1e16bfe64710008bdac174 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Sun, 2 Jun 2013 17:44:35 -0400
Subject: lint hosts.pp

Change-Id: If10470978ee31a398e0b88d8d98552c93d4706a2
---
 puppet/modules/site_config/manifests/hosts.pp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'puppet/modules/site_config/manifests/hosts.pp')

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 1e1590f5..83a1040d 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -1,11 +1,11 @@
 class site_config::hosts() {
-  $hosts = hiera('hosts','')
-  $hostname = hiera('name')
-  $domain_hash = hiera('domain')
+  $hosts         = hiera('hosts','')
+  $hostname      = hiera('name')
+  $domain_hash   = hiera('domain')
   $domain_public = $domain_hash['full_suffix']
 
-  file { "/etc/hostname":
-    ensure => present,
+  file { '/etc/hostname':
+    ensure  => present,
     content => $hostname
   }
 
@@ -16,6 +16,8 @@ class site_config::hosts() {
 
   file { '/etc/hosts':
     content => template('site_config/hosts'),
-    mode    => '0644', owner => root, group => root;
+    mode    => '0644',
+    owner   => root,
+    group   => root;
   }
 }
-- 
cgit v1.2.3


From 9a522267068a1bcede55ba388d526ddc263d155f Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 28 Jun 2013 11:28:13 -0400
Subject: restart stunnels if /etc/hosts is changed (#3031)

Due to the fact that /etc/hosts is modified in the early stage setup.pp run and
the stunnel service is not deployed on an initial puppet run, we cannot simply
override the Service['stunnel'] but instead need to trigger a restart through
an exec calling the init script that first tests to see if it is present.

Change-Id: I6bf5dfece9ecbdb8319747774185dec50d5a55f6
---
 puppet/modules/site_config/manifests/hosts.pp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'puppet/modules/site_config/manifests/hosts.pp')

diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index 83a1040d..ccedf036 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -14,6 +14,17 @@ class site_config::hosts() {
     refreshonly => true;
   }
 
+  # we depend on reliable hostnames from /etc/hosts for the stunnel services
+  # so restart stunnel service when /etc/hosts is modified
+  # because this is done in an early stage, the stunnel module may not
+  # have been deployed and will not be available for overriding, so
+  # this is handled in an unorthodox manner
+  exec { '/etc/init.d/stunnel4 restart':
+    subscribe   => File['/etc/hosts'],
+    refreshonly => true,
+    onlyif      => 'test -f /etc/init.d/stunnel4';
+  }
+
   file { '/etc/hosts':
     content => template('site_config/hosts'),
     mode    => '0644',
-- 
cgit v1.2.3