Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325834 )
Change subject: Gerrit: Remove exec/require/subscribe for auto-provisioning
......................................................................
Gerrit: Remove exec/require/subscribe for auto-provisioning
This causes diffs between `gerrit init` and puppet that are pointless
Also add serverId here, because gerrit re-adds it like an idiot
Also stop letting gerrit try to auto-provision itself and restart on
config changes. It needs far too much hand holding
Also change file permissions to stop gerrit from writing to config
files.
Change-Id: I0a521fe0b58e29c8b137d8692c99279cb70d4bdf
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
2 files changed, 7 insertions(+), 36 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index f4d566f..9fe9f9f 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -115,7 +115,7 @@
recurse => remote,
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0644',
+ mode => '0444',
source => 'puppet:///modules/gerrit/etc',
require => File['/var/lib/gerrit2/review_site'],
}
@@ -124,7 +124,7 @@
content => template('gerrit/gerrit.config.erb'),
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0664',
+ mode => '0444',
require => File['/var/lib/gerrit2/review_site/etc'],
}
@@ -132,7 +132,7 @@
content => template('gerrit/secure.config.erb'),
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0660',
+ mode => '0440',
require => File['/var/lib/gerrit2/review_site/etc'],
}
@@ -140,7 +140,7 @@
content => template('gerrit/log4j.properties.erb'),
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0664',
+ mode => '0444',
require => File['/var/lib/gerrit2/review_site/etc'],
}
@@ -158,7 +158,7 @@
content => template('gerrit/replication.config.erb'),
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0664',
+ mode => '0444',
require => File['/var/lib/gerrit2/review_site/etc'],
}
@@ -171,40 +171,11 @@
source => 'puppet:///modules/gerrit/static',
}
- exec { 'install_gerrit_jetty':
- creates => '/var/lib/gerrit2/review_site/bin',
- user => 'gerrit2',
- group => 'gerrit2',
- cwd => '/var/lib/gerrit2',
- command => '/usr/bin/java -jar gerrit.war init -d review_site --batch
--no-auto-start',
- require => [
- 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'],
- ],
- }
-
- exec { 'reindex_gerrit_jetty':
- creates => '/var/lib/gerrit2/review_site/index',
- user => 'gerrit2',
- group => 'gerrit2',
- cwd => '/var/lib/gerrit2',
- command => '/usr/bin/java -jar gerrit.war reindex -d review_site
--threads 4',
- require => Exec['install_gerrit_jetty'],
- }
-
service { 'gerrit':
ensure => running,
- subscribe => [
- File['/var/lib/gerrit2/review_site/etc/gerrit.config'],
- File['/var/lib/gerrit2/review_site/etc/secure.config'],
- File['/var/lib/gerrit2/review_site/etc/log4j.properties']
- ],
enable => true,
hasstatus => false,
status => '/etc/init.d/gerrit check',
- require => Exec['reindex_gerrit_jetty'],
}
file { '/etc/default/gerritcodereview':
@@ -223,6 +194,5 @@
command => 'find /var/lib/gerrit2/review_site/logs/ -name "*.gz"
-mtime +7 -delete',
user => 'root',
hour => 1,
- require => Exec['install_gerrit_jetty'],
}
}
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 466c6c6..11a238a 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -2,6 +2,7 @@
basePath = <%= @git_dir %>
canonicalWebUrl = <%= @url %>
reportBugUrl =
https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-lc5rwomzjp6fmcdpbw43
+ serverId = e9e9afe9-4712-486d-8885-f54b72dd1951
[core]
packedGitOpenFiles = 4096
packedGitLimit = 2g
@@ -122,7 +123,7 @@
html = <li class=\"ci_comment_test\"><span
class=\"ci_comment_test_name\">$2$1</a></span> <span
class=\"ci_comment_test_result\"><span
class=\"ci_result_$3\">$3</span>$4</span></li>
[commentlink "its-phabricator"]
# $1 must hold the bug number because of the notification bots that are
using this.
- match = "\\bT(\\d+)(#\\d+)?\\b(?![#\"]|</a>)"
+ match = "\\bT(\\d+)(#\\d+)?\\b(?![#\"]|</a>)"
link = https://phabricator.wikimedia.org/T$1$2
[mimetype "application/javascript"]
safe = true
--
To view, visit https://gerrit.wikimedia.org/r/325834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a521fe0b58e29c8b137d8692c99279cb70d4bdf
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
