Chad has uploaded a new change for review.

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

Change subject: Gerrit: Move jvm logs outside of gerrit logging folder
......................................................................

Gerrit: Move jvm logs outside of gerrit logging folder

Gerrit's rotation and gzipping scheme is kinda simplistic and the
JVM rotation doesn't play nicely with it.

While we're here, ensure the git storage location is setup properly
too, it should always be there (we can probably remove $git_dir in
a subsequent patch)

Change-Id: I29eb85b3998b91ad2935e65cb5c877f3bfb5bfd0
---
M modules/gerrit/manifests/jetty.pp
1 file changed, 25 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/317877/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index 0c338e7..5cc0148 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -28,7 +28,7 @@
     $ldap_proxyagent_pass = $ldapconfig['proxypass']
 
     $java_options = [
-        '-Xloggc:/var/lib/gerrit2/review_site/logs/jvm_gc.%p.log',
+        '-Xloggc:/srv/gerrit/jvmlogs/jvm_gc.%p.log',
         '-XX:+PrintGCDetails',
         '-XX:+PrintGCDateStamps',
         '-XX:+PrintTenuringDistribution',
@@ -40,6 +40,29 @@
     ]
 
     require_package(['openjdk-7-jdk', 'gerrit', 'libmysql-java'])
+
+    file { '/srv/gerrit':
+        ensure => directory,
+        owner  => 'gerrit2',
+        group  => 'gerrit2',
+        mode   => '0664',
+    }
+
+    file { '/srv/gerrit/jvmlogs':
+        ensure  => directory,
+        owner   => 'gerrit2',
+        group   => 'gerrit2',
+        mode    => '0664',
+        require => File['/srv/gerrit'],
+    }
+
+    file { '/srv/gerrit/git':
+        ensure  => directory,
+        owner   => 'gerrit2',
+        group   => 'gerrit2',
+        mode    => '0775',
+        require => File['/srv/gerrit'],
+    }
 
     file { '/var/lib/gerrit2/':
         ensure  => directory,
@@ -151,6 +174,7 @@
             File['/var/lib/gerrit2/review_site/etc/gerrit.config'],
             File['/var/lib/gerrit2/review_site/etc/secure.config'],
             File['/var/lib/gerrit2/review_site/lib/mysql-connector-java.jar'],
+            File['/srv/gerrit/jvmlogs'],
         ],
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I29eb85b3998b91ad2935e65cb5c877f3bfb5bfd0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>

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

Reply via email to