Author: ckauhaus
Date: Tue Dec  9 11:25:44 2008
New Revision: 7211

Log:
Removed sys_portage::package macro since the portage tree now is stable and
puppetd --tags bootstrap is in place


Removed:
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/defines.pp
Modified:
   gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp
   gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_firewall/manifests/iptables.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/files/update-system.sh
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -76,7 +76,7 (at)(at)
         mode => "700"
     }
 
-    sys_portage::package { "subversion": }
+    package { "subversion": }
 }
 
 class role::webgateway inherits role::customerproject {

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -20,10 +20,3 (at)(at)
     timeout => 10,
     refreshonly => true
 }
-
-
-# XXX Review: This is a safety belt to ensure that nobody accidentally forgets
to
-# use sys_portage::package
-Package {
-    noop => true
-}

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Configure logrotate
 class app_admin::logrotate {
 
-    sys_portage::package { "logrotate": }
+    package { "logrotate": }
 
     file { "/etc/logrotate.conf":
         source => "puppet:///app_admin/logrotate.conf"

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,8 +4,7 (at)(at)
     include location
     include tmpwatch
 
-    sys_portage::package { "puppet": 
-        ensure => "0.24.5-r4" }
+    package { "puppet": }
 
     service {
         "puppet":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,5 +1,9 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class app_admin::sudo {
-    sys_portage::package { "sudo": }
+
+    package { "sudo": }
 
     file { "/etc/sudoers":
         source => "puppet:///app_admin/sudoers",

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -2,7 +2,7 (at)(at)
 
 class app_admin::tmpwatch {
 
-    sys_portage::package { "tmpwatch": }
+    package { "tmpwatch": }
 
     file { "/etc/cron.daily/tmpwatch":
         source => "puppet:///app_admin/tmpwatch.cron",

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,3 +1,8 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class dev_ruby::rails {
-    sys_portage::package { "rails": }
+
+    package { "rails": }
+
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,6 +4,6 (at)(at)
 # Configuration for mailx, a simple command line mail tool
 class mail_client::mailx {
 
-    sys_portage::package { "mailx": }
+    package { "mailx": }
 
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -19,7 +19,7 (at)(at)
         require => [Group["nagios"], Group["ssmtp"]]
     }
 
-    sys_portage::package {
+    package {
         "nagios-nrpe":
             require => User["nagios"];
         "nagios-plugins":
(at)(at) -56,7 +56,7 (at)(at)
 class net_analyzer::nagios_server inherits net_analyzer::nagios_client {
     include www_apache::apache
 
-    sys_portage::package { "nagios":
+    package { "nagios":
         notify => Service["nagios"]
     }
 

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_firewall/manifests/iptables.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_firewall/manifests/iptables.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_firewall/manifests/iptables.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,5 +1,5 (at)(at)
 class net_firewall::iptables {
 
-    sys_portage::package{ "iptables": }
+    package{ "iptables": }
 
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,9 +1,10 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
 
+# memcached gets installed system-wide, listening on the vlan `srv`.
 class net_misc::memcached {
 
-    # memcached gets installed system-wide, listening on the vlan `srv`.
-
-    sys_portage::package { "memcached": }
+    package { "memcached": }
 
     file { "/etc/memcached.conf":
         content => template("net_misc/memcached.conf.erb"),

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Configure a NTP client. NTP servers are not managed yet.
 class net_misc::ntp {
 
-    sys_portage::package { "ntp": }
+    package { "ntp": }
 
     service {
         "ntpd":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Install rsync client
 class net_misc::rsync {
 
-    sys_portage::package { "rsync": }
+    package { "rsync": }
 
     service { "rsyncd":
         subscribe => Package["rsync"],

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Configure OpenSSH daemon
 class net_misc::sshd {
 
-    sys_portage::package { "openssh": }
+    package { "openssh": }
 
     service { "sshd":
             enable => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Basic configuration file that do not belong to specific packages
 class sys_apps::baselayout {
 
-    sys_portage::package { "iproute2": }
+    package { "iproute2": }
 
     $suffix = $location::suffix
 

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,6 +1,11 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
+# Configure a xinetd. Individual services should be configured as files in
+# /etc/xinetd.d by their respective classes.
 class sys_apps::xinetd {
 
-    sys_portage::package { "xinetd": }
+    package { "xinetd": }
 
     service { "xinetd":
         ensure => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -14,7 +14,7 (at)(at)
 # Configure device naming via udev
 class sys_fs::udev {
 
-    sys_portage::package { "udev":
+    package { "udev":
         ensure => "124-r1"
     }
 

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/files/update-system.sh
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/files/update-system.sh	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/files/update-system.sh	Tue
Dec  9 11:25:44 2008
(at)(at) -63,8 +63,9 (at)(at)
 # re-write various portage related package caches
 regen_metadata() {
     emerge -q --metadata
-    update-eix -q
-    q -qr
+    if [[ -x /etc/portage/bin/post_sync ]]; then
+        /etc/portage/bin/post_sync
+    fi
 }
 
 # perform all applicable hot fixes on the system until there is nothing left
to

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,5 +1,4 (at)(at)
 # Copyright (c) 2008 gocept gmbh & co. kg
 # See also LICENSE.txt
 
-import "defines.pp"
 import "update.pp"

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -56,7 +56,7 (at)(at)
 
     net_analyzer::service { "portage convergence":
         type => "nrpe",
-        command => 
-        "file_age -w 86400 -c 172800 -f /var/state/portage_convergence"
+        command =>
+        "file_age -w 43200 -c 86400 -f /var/state/portage_convergence"
     }
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,6 +1,9 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class sys_process::vixie_cron {
 
-    sys_portage::package { "vixie-cron": }
+    package { "vixie-cron": }
 
     service { "vixie-cron":
         ensure => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -4,7 +4,7 (at)(at)
 # Instantiate HTTP server
 class www_apache::apache {
 
-    sys_portage::package { "apache": }
+    package { "apache": }
 
     file {
         "/etc/conf.d/apache2":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,5 +1,9 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class www_nginx::nginx {
-    sys_portage::package { "nginx": }
+
+    package { "nginx": }
 
     file {
         "/etc/nginx/nginx.conf":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp	Tue
Dec  9 11:25:44 2008
(at)(at) -1,9 +1,12 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
 class www_zope::appserver {
 
     # This is a really bloaty class that pulls all kind of stuff we generally
     # need for running Zope applications.
 
-    sys_portage::package {
+    package {
         ["jpeg", "freetype"]:
     }
 
(at)(at) -15,7 +18,7 (at)(at)
     # This is a really bloaty class that pulls all kind of stuff we generally
     # need for running ZEO/database servers.
 
-    sys_portage::package {
+    package {
         ["jpeg", "freetype"]:
     }

Author: ctheune
Date: Tue Dec 16 10:13:03 2008
New Revision: 7290

Log:
- Provide basic functions to suport cleaning up config files managed by Gentoo
under CONFIG_PROTECT.
- Wrote new package type that automates signalling which config file versions
we have seen during development.
- Switch all existing package references to our new type, disabled the raw
builtin package type.



Added:
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/defines.pp
Modified:
   gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp
   gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_mta/manifests/ssmtp.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_ftp/manifests/pure_ftpd.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/eix.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp
  
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/manifests/classes/role.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -84,7 +84,9 (at)(at)
         mode => "700"
     }
 
-    package { "subversion": }
+    sys_portage::package { "subversion":
+        category => "dev-util"
+    }
 }
 
 class role::webgateway inherits role::customerproject {

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/manifests/defaults.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -20,3 +20,7 (at)(at)
     timeout => 10,
     refreshonly => true
 }
+
+Package {
+    noop => true    # prevent bare 'package' calls without our definition
+}

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/logrotate.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Configure logrotate
 class app_admin::logrotate {
 
-    package { "logrotate": }
+    sys_portage::package { "logrotate":
+        category => "app-admin"
+    }
 
     file { "/etc/logrotate.conf":
         source => "puppet:///app_admin/logrotate.conf"

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/puppet.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
     include location
     include tmpwatch
 
-    package { "puppet": }
+    sys_portage::package { "puppet":
+        category => "app-admin"
+    }
 
     service {
         "puppet":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/sudo.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -3,7 +3,9 (at)(at)
 
 class app_admin::sudo {
 
-    package { "sudo": }
+    sys_portage::package { "sudo":
+        category => "app-admin"
+    }
 
     file { "/etc/sudoers":
         source => "puppet:///app_admin/sudoers",

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/app_admin/manifests/tmpwatch.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -2,7 +2,9 (at)(at)
 
 class app_admin::tmpwatch {
 
-    package { "tmpwatch": }
+    sys_portage::package { "tmpwatch":
+        category => "app-admin"
+    }
 
     file { "/etc/cron.daily/tmpwatch":
         source => "puppet:///app_admin/tmpwatch.cron",

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/dev_ruby/manifests/rails.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -3,6 +3,8 (at)(at)
 
 class dev_ruby::rails {
 
-    package { "rails": }
+    sys_portage::package { "rails":
+        category => "dev-ruby"
+    }
 
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_client/manifests/mailx.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,6 +4,8 (at)(at)
 # Configuration for mailx, a simple command line mail tool
 class mail_client::mailx {
 
-    package { "mailx": }
+    sys_portage::package { "mailx":
+        category => "mail-client"
+    }
 
 }

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_mta/manifests/ssmtp.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_mta/manifests/ssmtp.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/mail_mta/manifests/ssmtp.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -9,7 +9,9 (at)(at)
 
     group { "ssmtp": gid => 445 }
 
-    package { "ssmtp": }
+    sys_portage::package { "ssmtp":
+        category => "mail-mta"
+    }
 
     file {
         "/etc/ssmtp/ssmtp.conf": content =>
template("mail_mta/ssmtp.conf.erb");

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_analyzer/manifests/nagios.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -19,11 +19,10 (at)(at)
         require => [Group["nagios"], Group["ssmtp"]]
     }
 
-    package {
-        "nagios-nrpe":
-            require => User["nagios"];
-        "nagios-plugins":
-            require => User["nagios"]
+    sys_portage::package {
+        ["nagios-nrpe", "nagios-plugins"]:
+            require => User["nagios"],
+            category => "net-analyzer"
     }
 
     net_analyzer::host { $fqdn: }
(at)(at) -56,7 +55,8 (at)(at)
 class net_analyzer::nagios_server inherits net_analyzer::nagios_client {
     include www_apache::apache
 
-    package { "nagios":
+    sys_portage::package { "nagios":
+        category => "net-analyzer",
         notify => Service["nagios"]
     }
 

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_ftp/manifests/pure_ftpd.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_ftp/manifests/pure_ftpd.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_ftp/manifests/pure_ftpd.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -6,7 +6,9 (at)(at)
 class net_ftp::pure_ftpd {
     include sys_apps::xinetd
 
-    package { "pure-ftpd": }
+    sys_portage::package { "pure-ftpd":
+        category => "net-ftp"
+    }
 
     file {
         "/etc/xinetd.d/pure-ftpd":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/memcached.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # memcached gets installed system-wide, listening on the vlan `srv`.
 class net_misc::memcached {
 
-    package { "memcached": }
+    sys_portage::package { "memcached":
+        category => "net-misc"
+    }
 
     file { "/etc/memcached.conf":
         content => template("net_misc/memcached.conf.erb"),

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ntp.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Configure a NTP client. NTP servers are not managed yet.
 class net_misc::ntp {
 
-    package { "ntp": }
+    sys_portage::package { "ntp":
+        category => "net-misc"
+    }
 
     service {
         "ntpd":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/rsync.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Install rsync client
 class net_misc::rsync {
 
-    package { "rsync": }
+    sys_portage::package { "rsync":
+        category => "net-misc"
+    }
 
     service { "rsyncd":
         subscribe => Package["rsync"],

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/net_misc/manifests/ssh.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Configure OpenSSH daemon
 class net_misc::sshd {
 
-    package { "openssh": }
+    sys_portage::package { "openssh":
+        category => "net-misc"
+    }
 
     service { "sshd":
             enable => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/baselayout.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Basic configuration file that do not belong to specific packages
 class sys_apps::baselayout {
 
-    package { "iproute2": }
+    sys_portage::package { "iproute2":
+        category => "sys-apps"
+    }
 
     $suffix = $location::suffix
 

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_apps/manifests/xinetd.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -5,7 +5,9 (at)(at)
 # /etc/xinetd.d by their respective classes.
 class sys_apps::xinetd {
 
-    package { "xinetd": }
+    sys_portage::package { "xinetd":
+        category => "sys-apps"
+    }
 
     service { "xinetd":
         ensure => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_fs/manifests/udev.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -14,8 +14,8 (at)(at)
 # Configure device naming via udev
 class sys_fs::udev {
 
-    package { "udev":
-        ensure => "124-r1"
+    sys_portage::package { "udev":
+        category => "sys-fs"
     }
 
     # We do not want the persistent net rules generator since we generate

Added:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/defines.pp
==============================================================================
--- (empty file)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/defines.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -0,0 +1,20 (at)(at)
+# Copyright (c) 2008 gocept gmbh & co. kg
+# See also LICENSE.txt
+
+define sys_portage::package($ensure="latest", $category,
+                            $config_seen="0") {
+    $packagename = $title
+
+    package { $packagename:
+        noop => false,
+        category => $category,
+        notify => Exec["configupdates"]
+    }
+
+    $fullname = "$category/$packagename"
+    $package_filename = "${category}_${packagename}"
+
+    file { "/var/lib/portage-gocept/config-seen.d/$package_filename":
+        content => "<=${fullname}-${config_seen}\n"
+    }
+}

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/eix.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/eix.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/eix.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -6,7 +6,9 (at)(at)
 class sys_portage::eix {
     tag "bootstrap"
 
-    package { "eix": }
+    sys_portage::package { "eix":
+        category => "sys-portage"
+    }
 
     file { "/etc/portage/postsync.d/eix-update":
         source => "puppet:///sys_portage/eix-update.sh",

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/init.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -2,3 +2,4 (at)(at)
 # See also LICENSE.txt
 
 import "binhost.pp"
+import "defines.pp"

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_portage/manifests/portage.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -29,8 +29,9 (at)(at)
         }
     }
 
-    package {
+    sys_portage::package {
         ["portage", "portage-utils", "gentoolkit"]:
+            category => "sys-portage",
             require =>  [
                 File["/etc/make.conf"],
                 File["/etc/portage"],
(at)(at) -69,6 +70,14 (at)(at)
         "/usr/local/sbin/convergence":
             source => "puppet:///sys_portage/convergence.sh",
             mode => 0755;
+        "/var/lib/portage-gocept":
+            ensure => directory;
+        "/var/lib/portage-gocept/config-seen.d":
+            ensure => directory;
+    }
+
+    exec { "configupdates":
+        command => "/bin/true" # XXX: replace with the real thing
     }
 
     net_analyzer::service { "portage convergence":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/sys_process/manifests/vixie_cron.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -3,7 +3,9 (at)(at)
 
 class sys_process::vixie_cron {
 
-    package { "vixie-cron": }
+    sys_portage::package { "vixie-cron":
+        category => "sys-process"
+    }
 
     service { "vixie-cron":
         ensure => true,

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_apache/manifests/apache.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -4,7 +4,9 (at)(at)
 # Instantiate HTTP server
 class www_apache::apache {
 
-    package { "apache": }
+    sys_portage::package { "apache":
+        category => "www-servers"
+    }
 
     file {
         "/etc/conf.d/apache2":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_nginx/manifests/nginx.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -3,7 +3,9 (at)(at)
 
 class www_nginx::nginx {
 
-    package { "nginx": }
+    sys_portage::package { "nginx":
+        category => "www-servers"
+    }
 
     file {
         "/etc/nginx/nginx.conf":

Modified:
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp
==============================================================================
---
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp	(original)
+++
gocept.infrastructure/feature_systemupgrade/puppet/modules/www_zope/manifests/zope.pp	Tue
Dec 16 10:13:03 2008
(at)(at) -6,8 +6,9 (at)(at)
     # This is a really bloaty class that pulls all kind of stuff we generally
     # need for running Zope applications.
 
-    package {
+    sys_portage::package {
         ["jpeg", "freetype"]:
+            category => "media-libs"
     }
 
 }
(at)(at) -18,8 +19,9 (at)(at)
     # This is a really bloaty class that pulls all kind of stuff we generally
     # need for running ZEO/database servers.
 
-    package {
+    sys_portage::package {
         ["jpeg", "freetype"]:
+            category => "media-libs"
     }
 
 }