Fix logrotation and rsyslog

.gitmodules

@@ -35,7 +35,7 @@
 	url = https://github.com/arioch/puppet-redis.git
 [submodule "modules/rsyslog"]
 	path = modules/rsyslog
-	url = https://github.com/saz/puppet-rsyslog.git
+	url = https://github.com/voxpupuli/puppet-rsyslog.git
 [submodule "modules/nfs"]
 	path = modules/nfs
 	url = https://github.com/derdanne/puppet-nfs.git

modules/droidwiki/manifests/default.pp

@@ -62,10 +62,7 @@
     target => '/usr/local/bin/pip',
   }
 
-  class { 'rsyslog::client':
-    server => 'eclair.dwnet',
-    port   => '1514',
-  }
+  include rsyslog::config
 
   if ($isnfsserver == false) {
     # all droidwiki servers should have access to the nfs shareddata

modules/postfix/manifests/init.pp

@@ -48,14 +48,14 @@
     ensure => 'directory',
     owner  => 'root',
     group  => 'root',
-    mode   => '0660',
+    mode   => '0640',
   }
 
   file { '/etc/postfix/sql/aliases.cf':
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',
-    mode    => '0660',
+    mode    => '0640',
     content => template('postfix/sql/aliases.cf.erb'),
     notify  => Service['postfix'],
   }
@@ -64,7 +64,7 @@
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',
-    mode    => '0660',
+    mode    => '0640',
     content => template('postfix/sql/domains.cf.erb'),
     notify  => Service['postfix'],
   }
@@ -73,7 +73,7 @@
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',
-    mode    => '0660',
+    mode    => '0640',
     content => template('postfix/sql/maps.cf.erb'),
     notify  => Service['postfix'],
   }
@@ -82,7 +82,7 @@
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',
-    mode    => '0660',
+    mode    => '0640',
     content => template('postfix/sql/no-srs.cf.erb'),
     notify  => Service['postfix'],
   }
@@ -91,7 +91,7 @@
     ensure  => 'file',
     owner   => 'root',
     group   => 'root',
-    mode    => '0660',
+    mode    => '0640',
     content => template('postfix/sql/sender-login-maps.cf.erb'),
     notify  => Service['postfix'],
   }
@@ -100,7 +100,7 @@
     ensure => 'file',
     owner  => 'root',
     group  => 'root',
-    mode   => '0660',
+    mode   => '0640',
     source => 'puppet:///modules/postfix/submission_header_cleanup',
     notify => Service['postfix'],
   }
@@ -116,7 +116,7 @@
     ensure => 'file',
     owner  => 'root',
     group  => 'root',
-    mode   => '0660',
+    mode   => '0640',
     source => 'puppet:///modules/postfix/local-generics',
     notify => Exec['refresh local-generics'],
   }

modules/role/manifests/mediawiki.pp

@@ -43,6 +43,8 @@
     mode   => '0777',
   }
 
+  $user  = 'www-data'
+  $group = 'www-data'
   file { '/etc/logrotate.d/mediawiki':
     content => template('role/mediawiki.logrotate.erb'),
     owner   => 'root',

modules/role/templates/concourse/docker-compose.yml.erb

@@ -12,7 +12,7 @@ services:
      - ./postgres-data:/var/lib/postgresql/data
 
   web:
-    image: concourse/concourse:6.1
+    image: concourse/concourse:6.4
     command: web
     restart: unless-stopped
     links: [db]
@@ -39,7 +39,7 @@ services:
       - 8.8.4.4
 
   worker:
-    image: concourse/concourse:6.1
+    image: concourse/concourse:6.4
     command: worker
     restart: unless-stopped
     privileged: true

modules/role/templates/mediawiki.logrotate.erb

@@ -1,14 +1,12 @@
 # logrotate(8) config for mediawiki
 # This file is managed by Puppet
 
-/data/log/mediawiki/*.log {
+/data/log/mediawiki/*.log* {
     su <%= @user %> <%= @group %>
     daily
     rotate 3
     maxage 5
     compress
     delaycompress
-    notifempty
     missingok
-    endscript
 }