Author: ckauhaus
Date: Fri Oct 17 15:23:28 2008
New Revision: 6835

Log:
merged feature_networking_66071


Added:
   gocept.infrastructure/testing/puppet/modules/sys_apps/files/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_apps/files/
   gocept.infrastructure/testing/puppet/modules/sys_apps/files/conf.d_net
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_apps/files/conf.d_net
  
gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/baselayout.pp
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_apps/manifests/baselayout.pp
   gocept.infrastructure/testing/puppet/modules/sys_apps/templates/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_apps/templates/
  
gocept.infrastructure/testing/puppet/modules/sys_apps/templates/conf.d_net_host.erb
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_apps/templates/conf.d_net_host.erb
   gocept.infrastructure/testing/puppet/modules/sys_fs/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/
   gocept.infrastructure/testing/puppet/modules/sys_fs/files/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/files/
   gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/manifests/
   gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/init.p
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/manifests/init.p
   gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/udev.pp
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/manifests/udev.pp
   gocept.infrastructure/testing/puppet/modules/sys_fs/templates/
      - copied from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/templates/
  
gocept.infrastructure/testing/puppet/modules/sys_fs/templates/70-persistent-net.rules.erb
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/modules/sys_fs/templates/70-persistent-net.rules.erb
  
gocept.infrastructure/testing/puppet/plugins/puppet/parser/functions/strip_netmask.rb
      - copied unchanged from r6834,
gocept.infrastructure/feature_networking_66071/puppet/plugins/puppet/parser/functions/strip_netmask.rb
Modified:
   gocept.infrastructure/testing/   (props changed)
  
gocept.infrastructure/testing/portage-gocept/app-backup/gocept-backup/gocept-backup-0.7.ebuild
  (props changed)
  
gocept.infrastructure/testing/portage-gocept/app-backup/gocept-backup/gocept-backup-0.8.ebuild
  (props changed)
   gocept.infrastructure/testing/puppet/manifests/classes/location.pp  
(contents, props changed)
   gocept.infrastructure/testing/puppet/manifests/classes/node_types.pp  
(contents, props changed)
   gocept.infrastructure/testing/puppet/manifests/defaults.pp
   gocept.infrastructure/testing/puppet/manifests/site.pp
  
gocept.infrastructure/testing/puppet/modules/net_analyzer/files/nagios/cgi.cfg 
 (props changed)
  
gocept.infrastructure/testing/puppet/modules/net_analyzer/files/nagios/globals/templates.cfg
  (props changed)
  
gocept.infrastructure/testing/puppet/modules/net_analyzer/files/nagios/nagios.cfg
  (props changed)
  
gocept.infrastructure/testing/puppet/modules/net_analyzer/files/nagios/nrpe.cfg
  (props changed)
  
gocept.infrastructure/testing/puppet/modules/net_analyzer/manifests/defines.pp
   gocept.infrastructure/testing/puppet/modules/net_misc/manifests/ssh.pp
   gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/init.pp
  
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf
  
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf
  
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include

Modified: gocept.infrastructure/testing/puppet/manifests/classes/location.pp
==============================================================================
---
gocept.infrastructure/testing/puppet/manifests/classes/location.pp	(original)
+++ gocept.infrastructure/testing/puppet/manifests/classes/location.pp	Fri Oct
17 15:23:28 2008
(at)(at) -1,11 +1,13 (at)(at)
 class location {
     case $location {
         "rzl": {
-            $puppetmaster = "stampy.whq.gocept.com"
+	    $suffix = "rzl.gocept.net"
+            $puppetmaster = "stampy.srv.rzl.gocept.net"
             $nagios_server = $puppetmaster
             $ldap_server = "ldap.gocept.com"
         }
         "whq": {
+	    $suffix = "whq.gocept.com"
             $puppetmaster = "uter.whq.gocept.com"
             $nagios_server = $puppetmaster
             $ldap_server = "ldap.whq.gocept.com"

Modified: gocept.infrastructure/testing/puppet/manifests/classes/node_types.pp
==============================================================================
---
gocept.infrastructure/testing/puppet/manifests/classes/node_types.pp	(original)
+++ gocept.infrastructure/testing/puppet/manifests/classes/node_types.pp	Fri
Oct 17 15:23:28 2008
(at)(at) -1,3 +1,6 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class generic_node {
     include location
     include app_admin::puppetclient
(at)(at) -5,6 +8,8 (at)(at)
     include app_admin::sudo
     include net_analyzer::nagios_client
     include net_misc::sshd
+    include sys_apps::baselayout
+    include sys_fs::udev
     include sys_portage::portage
     include sys_process::vixie_cron
 
(at)(at) -13,5 +18,5 (at)(at)
     net_analyzer::host { $fqdn:
         shortname => $hostname
     }
-        
+
 }

Modified: gocept.infrastructure/testing/puppet/manifests/defaults.pp
==============================================================================
--- gocept.infrastructure/testing/puppet/manifests/defaults.pp	(original)
+++ gocept.infrastructure/testing/puppet/manifests/defaults.pp	Fri Oct 17
15:23:28 2008
(at)(at) -8,3 +8,10 (at)(at)
     hasrestart => true,
     hasstatus => true
 }
+
+Exec {
+    logoutput => on_failure,
+    path =>
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin",
+    timeout => 10,
+    refreshonly => true 
+}

Modified: gocept.infrastructure/testing/puppet/manifests/site.pp
==============================================================================
--- gocept.infrastructure/testing/puppet/manifests/site.pp	(original)
+++ gocept.infrastructure/testing/puppet/manifests/site.pp	Fri Oct 17 15:23:28
2008
(at)(at) -3,4 +3,4 (at)(at)
 import "classes/*.pp"
 import "users/*.pp"
 
-# Remember: Modules are imported automatically.
+# Modules are imported automatically

Modified:
gocept.infrastructure/testing/puppet/modules/net_analyzer/manifests/defines.pp
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/net_analyzer/manifests/defines.pp	(original)
+++
gocept.infrastructure/testing/puppet/modules/net_analyzer/manifests/defines.pp	Fri
Oct 17 15:23:28 2008
(at)(at) -1,7 +1,7 (at)(at)
 # Macros for easy definition of Nagios checks
 
 define net_analyzer::host($shortname, $hostalias = false) {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $address = $title
     $alias_ = $hostalias ? {
         false => $fqdn,
(at)(at) -22,7 +22,7 (at)(at)
 
 define net_analyzer::direct_service($command = false,
                                     $ensure = "present") {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $file = filename_safe("$title.cfg")
     $service = $title
     $check_command = $command ? {
(at)(at) -41,7 +41,7 (at)(at)
 }
 
 define net_analyzer::nrpe_service($command = "", $ensure = "present") {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $safetitle = filename_safe($title)
     $file = "$safetitle.cfg"
     $service = $title

Modified:
gocept.infrastructure/testing/puppet/modules/net_misc/manifests/ssh.pp
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/net_misc/manifests/ssh.pp	(original)
+++ gocept.infrastructure/testing/puppet/modules/net_misc/manifests/ssh.pp	Fri
Oct 17 15:23:28 2008
(at)(at) -1,3 +1,7 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
+# Configure OpenSSH daemon
 class net_misc::sshd {
 
     package { "openssh": }

Modified:
gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/init.pp
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/init.pp	(original)
+++ gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/init.pp	Fri
Oct 17 15:23:28 2008
(at)(at) -1 +1,2 (at)(at)
+import "baselayout.pp"
 import "xinetd.pp"

Modified:
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf	(original)
+++
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf	Fri
Oct 17 15:23:28 2008
(at)(at) -9,7 +9,6 (at)(at)
 Listen 443
 
 <VirtualHost _default_:443>
-	ServerName stampy.whq.gocept.com
 	Include /etc/apache2/vhosts.d/default_vhost.include
 
 	<IfModule log_config_module>

Modified:
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf	(original)
+++
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf	Fri
Oct 17 15:23:28 2008
(at)(at) -36,7 +36,6 (at)(at)
 # /etc/conf.d/apache2, the first defined virtual host elsewhere will be
 # the default.
 <VirtualHost *:80>
-	ServerName stampy.whq.gocept.com
 	Include /etc/apache2/vhosts.d/default_vhost.include
 
 	<IfModule mpm_peruser_module>

Modified:
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include
==============================================================================
---
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include	(original)
+++
gocept.infrastructure/testing/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include	Fri
Oct 17 15:23:28 2008
(at)(at) -1,3 +1,5 (at)(at)
+ServerName stampy.rzl.gocept.net
+
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin(at)your-domain.com

Author: ctheune
Date: Sat Oct 18 15:34:13 2008
New Revision: 6836

Log:
merge current state of testing



Added:
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/files/
      - copied from r6835,
gocept.infrastructure/testing/puppet/modules/sys_apps/files/
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/files/conf.d_net
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_apps/files/conf.d_net
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/manifests/baselayout.pp
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_apps/manifests/baselayout.pp
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/templates/
      - copied from r6835,
gocept.infrastructure/testing/puppet/modules/sys_apps/templates/
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/templates/conf.d_net_host.erb
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_apps/templates/conf.d_net_host.erb
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/
      - copied from r6835, gocept.infrastructure/testing/puppet/modules/sys_fs/
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/files/
      - copied from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/files/
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/manifests/
      - copied from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/manifests/init.p
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/init.p
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/manifests/udev.pp
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/manifests/udev.pp
   gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/templates/
      - copied from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/templates/
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_fs/templates/70-persistent-net.rules.erb
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/modules/sys_fs/templates/70-persistent-net.rules.erb
  
gocept.infrastructure/feature_vmnodes/puppet/plugins/puppet/parser/functions/strip_netmask.rb
      - copied unchanged from r6835,
gocept.infrastructure/testing/puppet/plugins/puppet/parser/functions/strip_netmask.rb
Modified:
   gocept.infrastructure/feature_vmnodes/   (props changed)
  
gocept.infrastructure/feature_vmnodes/portage-gocept/app-backup/gocept-backup/gocept-backup-0.7.ebuild
  (props changed)
  
gocept.infrastructure/feature_vmnodes/portage-gocept/app-backup/gocept-backup/gocept-backup-0.8.ebuild
  (props changed)
   gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/location.pp  
(contents, props changed)
   gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/node_types.pp
  (contents, props changed)
   gocept.infrastructure/feature_vmnodes/puppet/manifests/defaults.pp
   gocept.infrastructure/feature_vmnodes/puppet/manifests/site.pp
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/files/nagios/cgi.cfg
  (props changed)
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/files/nagios/globals/templates.cfg
  (props changed)
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/files/nagios/nagios.cfg
  (props changed)
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/files/nagios/nrpe.cfg
  (props changed)
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/manifests/defines.pp
  
gocept.infrastructure/feature_vmnodes/puppet/modules/net_misc/manifests/ssh.pp
  
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/manifests/init.pp
  
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf
  
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf
  
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include

Modified:
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/location.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/location.pp	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/location.pp	Sat
Oct 18 15:34:13 2008
(at)(at) -1,11 +1,13 (at)(at)
 class location {
     case $location {
         "rzl": {
-            $puppetmaster = "stampy.whq.gocept.com"
+	    $suffix = "rzl.gocept.net"
+            $puppetmaster = "stampy.srv.rzl.gocept.net"
             $nagios_server = $puppetmaster
             $ldap_server = "ldap.gocept.com"
         }
         "whq": {
+	    $suffix = "whq.gocept.com"
             $puppetmaster = "uter.whq.gocept.com"
             $nagios_server = $puppetmaster
             $ldap_server = "ldap.whq.gocept.com"

Modified:
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/node_types.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/node_types.pp	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/manifests/classes/node_types.pp	Sat
Oct 18 15:34:13 2008
(at)(at) -1,3 +1,6 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class generic_node {
     include location
     include app_admin::puppetclient
(at)(at) -5,6 +8,8 (at)(at)
     include app_admin::sudo
     include net_analyzer::nagios_client
     include net_misc::sshd
+    include sys_apps::baselayout
+    include sys_fs::udev
     include sys_portage::portage
     include sys_process::vixie_cron
 
(at)(at) -13,5 +18,5 (at)(at)
     net_analyzer::host { $fqdn:
         shortname => $hostname
     }
-        
+
 }

Modified: gocept.infrastructure/feature_vmnodes/puppet/manifests/defaults.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/manifests/defaults.pp	(original)
+++ gocept.infrastructure/feature_vmnodes/puppet/manifests/defaults.pp	Sat Oct
18 15:34:13 2008
(at)(at) -8,3 +8,10 (at)(at)
     hasrestart => true,
     hasstatus => true
 }
+
+Exec {
+    logoutput => on_failure,
+    path =>
"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin",
+    timeout => 10,
+    refreshonly => true 
+}

Modified: gocept.infrastructure/feature_vmnodes/puppet/manifests/site.pp
==============================================================================
--- gocept.infrastructure/feature_vmnodes/puppet/manifests/site.pp	(original)
+++ gocept.infrastructure/feature_vmnodes/puppet/manifests/site.pp	Sat Oct 18
15:34:13 2008
(at)(at) -3,4 +3,4 (at)(at)
 import "classes/*.pp"
 import "users/*.pp"
 
-# Remember: Modules are imported automatically.
+# Modules are imported automatically

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/manifests/defines.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/manifests/defines.pp	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/net_analyzer/manifests/defines.pp	Sat
Oct 18 15:34:13 2008
(at)(at) -1,7 +1,7 (at)(at)
 # Macros for easy definition of Nagios checks
 
 define net_analyzer::host($shortname, $hostalias = false) {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $address = $title
     $alias_ = $hostalias ? {
         false => $fqdn,
(at)(at) -22,7 +22,7 (at)(at)
 
 define net_analyzer::direct_service($command = false,
                                     $ensure = "present") {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $file = filename_safe("$title.cfg")
     $service = $title
     $check_command = $command ? {
(at)(at) -41,7 +41,7 (at)(at)
 }
 
 define net_analyzer::nrpe_service($command = "", $ensure = "present") {
-    $directory = "/etc/nagios/hosts/$fqdn"
+    $directory = "/etc/nagios/hosts/$hostname"
     $safetitle = filename_safe($title)
     $file = "$safetitle.cfg"
     $service = $title

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/net_misc/manifests/ssh.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/net_misc/manifests/ssh.pp	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/net_misc/manifests/ssh.pp	Sat
Oct 18 15:34:13 2008
(at)(at) -1,3 +1,7 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
+# Configure OpenSSH daemon
 class net_misc::sshd {
 
     package { "openssh": }

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/manifests/init.pp
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/manifests/init.pp	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/sys_apps/manifests/init.pp	Sat
Oct 18 15:34:13 2008
(at)(at) -1 +1,2 (at)(at)
+import "baselayout.pp"
 import "xinetd.pp"

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_ssl_vhost.conf	Sat
Oct 18 15:34:13 2008
(at)(at) -9,7 +9,6 (at)(at)
 Listen 443
 
 <VirtualHost _default_:443>
-	ServerName stampy.whq.gocept.com
 	Include /etc/apache2/vhosts.d/default_vhost.include
 
 	<IfModule log_config_module>

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/00_default_vhost.conf	Sat
Oct 18 15:34:13 2008
(at)(at) -36,7 +36,6 (at)(at)
 # /etc/conf.d/apache2, the first defined virtual host elsewhere will be
 # the default.
 <VirtualHost *:80>
-	ServerName stampy.whq.gocept.com
 	Include /etc/apache2/vhosts.d/default_vhost.include
 
 	<IfModule mpm_peruser_module>

Modified:
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include
==============================================================================
---
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include	(original)
+++
gocept.infrastructure/feature_vmnodes/puppet/modules/www_apache/files/apache/vhosts.d/default_vhost.include	Sat
Oct 18 15:34:13 2008
(at)(at) -1,3 +1,5 (at)(at)
+ServerName stampy.rzl.gocept.net
+
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. admin(at)your-domain.com