[MediaWiki-commits] [Gerrit] operations/puppet[production]: Point to a folder firejailed thumbor can actually write to

[Gilles (Code Review)]

Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315234

Change subject: Point to a folder firejailed thumbor can actually write to
......................................................................

Point to a folder firejailed thumbor can actually write to

Refs T145632

Change-Id: I2071d7ea6545b7f9cd0d8aa2e0b041b2daa683d9
---
M modules/thumbor/files/thumbor.logrotate.conf
M modules/thumbor/files/thumbor.rsyslog.conf
M modules/thumbor/manifests/init.pp
M modules/thumbor/templates/server.conf.erb
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/315234/1

diff --git a/modules/thumbor/files/thumbor.logrotate.conf 
b/modules/thumbor/files/thumbor.logrotate.conf
index c457d82..f7aac01 100644
--- a/modules/thumbor/files/thumbor.logrotate.conf
+++ b/modules/thumbor/files/thumbor.logrotate.conf
@@ -1,4 +1,4 @@
-/var/log/thumbor/thumbor.error.log
+/srv/thumbor/log/thumbor.error.log
 {
     rotate 4
     daily
diff --git a/modules/thumbor/files/thumbor.rsyslog.conf 
b/modules/thumbor/files/thumbor.rsyslog.conf
index 0d84006..99db539 100644
--- a/modules/thumbor/files/thumbor.rsyslog.conf
+++ b/modules/thumbor/files/thumbor.rsyslog.conf
@@ -1,4 +1,4 @@
 if ($programname startswith 'thumbor') then {
-    action(type="omfile" file="/var/log/thumbor/thumbor.error.log")
+    action(type="omfile" file="/srv/thumbor/log/thumbor.error.log")
     stop
 }
diff --git a/modules/thumbor/manifests/init.pp 
b/modules/thumbor/manifests/init.pp
index 7c1fedb..ba212c8 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -39,11 +39,11 @@
         group  => 'root',
     }
 
-    file { '/var/log/thumbor':
+    file { ['/srv/thumbor', '/srv/thumbor/log', '/srv/thumbor/tmp']:
         ensure => directory,
-        owner  => 'thumbor',
-        group  => 'root',
         mode   => '0755',
+        owner  => 'thumbor',
+        group  => 'thumbor',
     }
 
     file { ['/srv/thumbor', '/srv/thumbor/tmp']:
diff --git a/modules/thumbor/templates/server.conf.erb 
b/modules/thumbor/templates/server.conf.erb
index f50086e..10d9d6d 100644
--- a/modules/thumbor/templates/server.conf.erb
+++ b/modules/thumbor/templates/server.conf.erb
@@ -196,7 +196,7 @@
             'level': 'WARNING',
             'class': 'logging.handlers.TimedRotatingFileHandler',
             'formatter': 'default',
-            'filename': '/var/log/thumbor/thumbor.404.log',
+            'filename': '/srv/thumbor/log/thumbor.404.log',
             'interval': 1,
             'when': 'D',
             'backupCount': 4,

-- 
To view, visit https://gerrit.wikimedia.org/r/315234
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2071d7ea6545b7f9cd0d8aa2e0b041b2daa683d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <gdu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits