make loghost into a role

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index c776361..97c06e3 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -374,3 +374,7 @@ roles:
     - lw08.debian.org
   anonscm:
     - cgi-grnet-01.debian.org
+  loghost:
+    - loghost-grnet-01.debian.org
+    - loghost-osuosl-01.debian.org
+    - lotti.debian.org

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8bc6aa5..1837f94 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -395,4 +395,7 @@ class roles {
                include roles::anonscm
        }
 
+       if has_role('loghost') {
+               include syslog_ng::loghost
+       }
 }

diff --git a/modules/syslog_ng/manifests/init.pp b/modules/syslog_ng/manifests/init.pp
index e7a20b6..172c2c7 100644 (file)
--- a/modules/syslog_ng/manifests/init.pp
+++ b/modules/syslog_ng/manifests/init.pp
@@ -23,20 +23,6 @@ class syslog_ng {
                source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate',
                require => Package['syslog-ng']
        }
-       if $::hostname in [lotti,loghost-grnet-01,loghost-osuosl-01] {
-               file { '/etc/logrotate.d/syslog-ng-loggers':
-                       source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate.loggers',
-                       require => Package['syslog-ng']
-               }
-               file { '/etc/cron.daily/local-handle-loghost-logs':
-                       ensure => absent,
-               }
-               file { '/etc/cron.daily/puppet-handle-loghost-logs':
-                       source => 'puppet:///modules/syslog_ng/loggers-cron',
-                       mode   => '0555',
-               }
-       }
-       # while syslog-ng breaks on boot
 
        if $systemd {
                file { '/etc/systemd/system/syslog-ng.service':

diff --git a/modules/syslog_ng/manifests/loghost.pp b/modules/syslog_ng/manifests/loghost.pp
new file mode 100644 (file)
index 0000000..47f4d28
--- /dev/null
+++ b/modules/syslog_ng/manifests/loghost.pp
@@ -0,0 +1,13 @@
+class syslog_ng::loghost {
+       file { '/etc/logrotate.d/syslog-ng-loggers':
+               source  => 'puppet:///modules/syslog_ng/syslog-ng.logrotate.loggers',
+               require => Package['syslog-ng']
+       }
+       file { '/etc/cron.daily/puppet-handle-loghost-logs':
+               source => 'puppet:///modules/syslog_ng/loggers-cron',
+               mode   => '0555',
+       }
+       file { '/var/log/.nobackup':
+               ensure => present,
+       }
+}