--- Nrpe::Check[check_gerrit].orig
+++ Nrpe::Check[check_gerrit]
@@
- command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site'
+ command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/gerrit/site_path/review_site/bin/gerrit.war daemon -d /srv/gerrit/site_path/review_site'
File[/var/www/wikimedia-codereview-logo.cache.png]
- Parameters differences:
--- File[/var/www/wikimedia-codereview-logo.cache.png].orig
+++ File[/var/www/wikimedia-codereview-logo.cache.png]
@@
- target => /var/lib/gerrit/review_site/static/wikimedia-codereview-logo.cache.png
+ target => /srv/gerrit/site_path/review_site/static/wikimedia-codereview-logo.cache.png
- Concat::Fragment[/etc/rsyncd.conf-gerrit-var-lib]
- Rsync::Server::Module[gerrit-var-lib]
- Parameters differences:
--- Rsync::Server::Module[gerrit-var-lib].orig
+++ Rsync::Server::Module[gerrit-var-lib]
@@
- path => /var/lib/gerrit/review_site
+ path => /srv/gerrit/site_path/review_site
- Class[Profile::Gerrit]
- Parameters differences:
--- Class[Profile::Gerrit].orig
+++ Class[Profile::Gerrit]
@@
- gerrit_site => /var/lib/gerrit/review_site
+ gerrit_site => /srv/gerrit/site_path/review_site
@@
- daemon_user_dir => /var/lib/gerrit
+ daemon_user_dir => /srv/gerrit
- File[/etc/nagios/nrpe.d/check_gerrit.cfg]
- Content differences:
--- /etc/nagios/nrpe.d/check_gerrit.cfg.orig
+++ /etc/nagios/nrpe.d/check_gerrit.cfg
@@ -1,2 +1,2 @@
# File generated by puppet. DO NOT edit by hand
-command[check_gerrit]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site'
+command[check_gerrit]=/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/gerrit/site_path/review_site/bin/gerrit.war daemon -d /srv/gerrit/site_path/review_site'
- Systemd::Unit[gerrit]
- Concat_fragment[/etc/rsyncd.conf-gerrit-var-lib]
- Content differences:
--- /etc/rsyncd.conf-gerrit-var-lib.orig
+++ /etc/rsyncd.conf-gerrit-var-lib
@@ -2,7 +2,7 @@
# DO NOT EDIT
[ gerrit-var-lib ]
-path = /var/lib/gerrit/review_site
+path = /srv/gerrit/site_path/review_site
read only = no
write only = no
list = yes
- File[/etc/gerrit]
- Parameters differences:
--- File[/etc/gerrit].orig
+++ File[/etc/gerrit]
@@
- target => /var/lib/gerrit/review_site/etc
+ target => /srv/gerrit/site_path/review_site/etc
- Nrpe::Monitor_service[gerrit]
- Parameters differences:
--- Nrpe::Monitor_service[gerrit].orig
+++ Nrpe::Monitor_service[gerrit]
@@
- nrpe_command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site'
+ nrpe_command => /usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 --ereg-argument-array '^/usr/lib/jvm/java-17-openjdk-amd64/bin/java .*-jar /srv/gerrit/site_path/review_site/bin/gerrit.war daemon -d /srv/gerrit/site_path/review_site'
- Systemd::Sysuser[gerrit]
- Parameters differences:
--- Systemd::Sysuser[gerrit].orig
+++ Systemd::Sysuser[gerrit]
@@
- home_dir => /var/lib/gerrit
+ home_dir => /srv/gerrit
- Class[Gerrit]
- Parameters differences:
--- Class[Gerrit].orig
+++ Class[Gerrit]
@@
- gerrit_site => /var/lib/gerrit/review_site
+ gerrit_site => /srv/gerrit/site_path/review_site
@@
- daemon_user_dir => /var/lib/gerrit
+ daemon_user_dir => /srv/gerrit
- User[gerrit]
- Parameters differences:
--- User[gerrit].orig
+++ User[gerrit]
@@
- home => /var/lib/gerrit
+ home => /srv/gerrit
- File[/etc/default/gerrit]
- Content differences:
--- /etc/default/gerrit.orig
+++ /etc/default/gerrit
@@ -1,2 +1,2 @@
-GERRIT_SITE="/var/lib/gerrit/review_site"
-GERRIT_WAR="/var/lib/gerrit/review_site/bin/gerrit.war"
+GERRIT_SITE="/srv/gerrit/site_path/review_site"
+GERRIT_WAR="/srv/gerrit/site_path/review_site/bin/gerrit.war"
- File[/etc/sysusers.d/gerrit.conf]
- Content differences:
--- /etc/sysusers.d/gerrit.conf.orig
+++ /etc/sysusers.d/gerrit.conf
@@ -1 +1 @@
-u gerrit 925:925 "Gerrit daemon user" /var/lib/gerrit /bin/bash
+u gerrit 925:925 "Gerrit daemon user" /srv/gerrit /bin/bash
- File[/lib/systemd/system/gerrit.service]
- Content differences:
--- /lib/systemd/system/gerrit.service.orig
+++ /lib/systemd/system/gerrit.service
@@ -7,7 +7,7 @@
Group=gerrit
Type=simple
EnvironmentFile=/etc/default/gerrit
-ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java -Xmx64g -Xms64g -Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance -Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance -Dh2.maxCompactTime=15000 -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=15 -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -XX:HeapDumpPath=/srv/gerrit -jar /var/lib/gerrit/review_site/bin/gerrit.war daemon -d /var/lib/gerrit/review_site --replica --enable-httpd
+ExecStart=/usr/lib/jvm/java-17-openjdk-amd64/bin/java -Xmx64g -Xms64g -Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance -Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance -Dh2.maxCompactTime=15000 -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=15 -XX:+UseStringDeduplication -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -XX:HeapDumpPath=/srv/gerrit -jar /srv/gerrit/site_path/review_site/bin/gerrit.war daemon -d /srv/gerrit/site_path/review_site --replica --enable-httpd
# Give it a bit more time to terminate cleanly.
#
- File[/srv/gerrit]
- Parameters differences:
--- File[/srv/gerrit].orig
+++ File[/srv/gerrit]
+ recurse => remote
+ source => puppet:///modules/gerrit/homedir
@@
- mode => 0775
+ mode => 0755
- Systemd::Service[gerrit]
- Class[Profile::Gerrit::Proxy]
- Parameters differences:
--- Class[Profile::Gerrit::Proxy].orig
+++ Class[Profile::Gerrit::Proxy]
@@
- gerrit_site => /var/lib/gerrit/review_site
+ gerrit_site => /srv/gerrit/site_path/review_site
- Class[Profile::Gerrit::Migration]
- Parameters differences:
--- Class[Profile::Gerrit::Migration].orig
+++ Class[Profile::Gerrit::Migration]
@@
- gerrit_site => /var/lib/gerrit/review_site
+ gerrit_site => /srv/gerrit/site_path/review_site