[dw-ops] Given our production setup, use server and not servername. There's probably a way to make

[mark]

[commit: http://hg.dwscoalition.org/dw-ops/rev/163f9901bcad]

Given our production setup, use server and not servername. There's probably
a way to make the latter work but after an hour of messing with SSL
certificates, I give up.

Patch by mark.

Files modified:

• puppet/manifests/site.pp
• puppet/modules/apache2/manifests/init.pp
• puppet/modules/iptables/manifests/init.pp
• puppet/modules/puppet/manifests/init.pp

--------------------------------------------------------------------------------
diff -r ff1d4de36f5c -r 163f9901bcad puppet/manifests/site.pp
--- a/puppet/manifests/site.pp	Fri Mar 27 07:44:46 2009 +0000
+++ b/puppet/manifests/site.pp	Fri Mar 27 08:21:03 2009 +0000
@@ -40,6 +40,11 @@ define line($file, $line, $ensure = 'pre
 ###############################################################################
 # DREAMWIDTH SITE SPECIFICATION
 #
+#
+# define server, used in some templates.  note that we can't use $servername
+# in the particular setup DW is using...
+$server = 'puppet'
+
 # Import the standard Dreamwidth server classes
 import "serverclass/*"
 
diff -r ff1d4de36f5c -r 163f9901bcad puppet/modules/apache2/manifests/init.pp
--- a/puppet/modules/apache2/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
+++ b/puppet/modules/apache2/manifests/init.pp	Fri Mar 27 08:21:03 2009 +0000
@@ -86,7 +86,7 @@ class apache2 {
           mode => 644,
           owner => root,
           group => root,
-          source => "puppet://$servername/apache2/apache2.conf",
+          source => "puppet://$server/apache2/apache2.conf",
           require => File[$apache_conf],
         }
 
diff -r ff1d4de36f5c -r 163f9901bcad puppet/modules/iptables/manifests/init.pp
--- a/puppet/modules/iptables/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
+++ b/puppet/modules/iptables/manifests/init.pp	Fri Mar 27 08:21:03 2009 +0000
@@ -23,7 +23,7 @@ class iptables {
         mode => 755,
         owner => root,
         group => root,
-        source => "puppet://$servername/iptables/iptables"
+        source => "puppet://$server/iptables/iptables"
     }
 
     # run the iptables-restore program to reload the rules
diff -r ff1d4de36f5c -r 163f9901bcad puppet/modules/puppet/manifests/init.pp
--- a/puppet/modules/puppet/manifests/init.pp	Fri Mar 27 07:44:46 2009 +0000
+++ b/puppet/modules/puppet/manifests/init.pp	Fri Mar 27 08:21:03 2009 +0000
@@ -14,7 +14,7 @@ class puppet {
         $source = ''
     ) {
         $real_source = $source ? {
-            '' => "puppet://$servername/puppet/puppetd.conf",
+            '' => "puppet://$server/puppet/puppetd.conf",
             default => $source
         }
 
@@ -44,7 +44,7 @@ class puppet {
         $source = ''
     ) {
         $real_source = $source ? {
-            '' => "puppet://$servername/puppet/puppetmasterd.conf",
+            '' => "puppet://$server/puppet/puppetmasterd.conf",
             default => $source
         }
 
--------------------------------------------------------------------------------