Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/300048
Change subject: WIP: Gerrit: Greatly simplify directory management on host
......................................................................
WIP: Gerrit: Greatly simplify directory management on host
We can recurse => remote all of these directories, mostly the
files in etc/, so adding/removing/renaming a new static file,
config file, or Header/Footer/CSS file doesn't need a manifest
change.
recurse => remote is so cool :)
Change-Id: Iff8d4b47e88f62c0cc973a6031b6d07101510c51
---
R modules/gerrit/files/.ssh/known_hosts
R modules/gerrit/files/etc/GerritSite.css
R modules/gerrit/files/etc/GerritSiteHeader.html
R modules/gerrit/files/etc/its/action.config
R modules/gerrit/files/etc/its/templates/DraftPublished.vm
R modules/gerrit/files/etc/its/templates/PatchSetCreated.vm
R modules/gerrit/files/etc/mail/ChangeSubject.vm
R modules/gerrit/files/static/page-bkg.cache.jpg
R modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
M modules/gerrit/manifests/jetty.pp
10 files changed, 9 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/48/300048/1
diff --git a/modules/gerrit/files/known_hosts
b/modules/gerrit/files/.ssh/known_hosts
similarity index 100%
rename from modules/gerrit/files/known_hosts
rename to modules/gerrit/files/.ssh/known_hosts
diff --git a/modules/gerrit/files/skin/GerritSite.css
b/modules/gerrit/files/etc/GerritSite.css
similarity index 100%
rename from modules/gerrit/files/skin/GerritSite.css
rename to modules/gerrit/files/etc/GerritSite.css
diff --git a/modules/gerrit/files/skin/GerritSiteHeader.html
b/modules/gerrit/files/etc/GerritSiteHeader.html
similarity index 100%
rename from modules/gerrit/files/skin/GerritSiteHeader.html
rename to modules/gerrit/files/etc/GerritSiteHeader.html
diff --git a/modules/gerrit/files/its/action.config
b/modules/gerrit/files/etc/its/action.config
similarity index 100%
rename from modules/gerrit/files/its/action.config
rename to modules/gerrit/files/etc/its/action.config
diff --git a/modules/gerrit/files/its/templates/DraftPublished.vm
b/modules/gerrit/files/etc/its/templates/DraftPublished.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/DraftPublished.vm
rename to modules/gerrit/files/etc/its/templates/DraftPublished.vm
diff --git a/modules/gerrit/files/its/templates/PatchSetCreated.vm
b/modules/gerrit/files/etc/its/templates/PatchSetCreated.vm
similarity index 100%
rename from modules/gerrit/files/its/templates/PatchSetCreated.vm
rename to modules/gerrit/files/etc/its/templates/PatchSetCreated.vm
diff --git a/modules/gerrit/files/mail/ChangeSubject.vm
b/modules/gerrit/files/etc/mail/ChangeSubject.vm
similarity index 100%
rename from modules/gerrit/files/mail/ChangeSubject.vm
rename to modules/gerrit/files/etc/mail/ChangeSubject.vm
diff --git a/modules/gerrit/files/skin/page-bkg.cache.jpg
b/modules/gerrit/files/static/page-bkg.cache.jpg
similarity index 100%
rename from modules/gerrit/files/skin/page-bkg.cache.jpg
rename to modules/gerrit/files/static/page-bkg.cache.jpg
Binary files differ
diff --git a/modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
b/modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
similarity index 100%
rename from modules/gerrit/files/skin/wikimedia-codereview-logo.cache.png
rename to modules/gerrit/files/static/wikimedia-codereview-logo.cache.png
Binary files differ
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 2832fab..f633fc5 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -61,9 +61,12 @@
file { '/var/lib/gerrit2/.ssh':
ensure => directory,
+ recurse => remote,
mode => '0600',
owner => 'gerrit2',
+ group => 'gerrit2',
require => File['/var/lib/gerrit2'],
+ source => 'puppet:///modules/gerrit/.ssh',
}
file { '/var/lib/gerrit2/.ssh/id_rsa':
@@ -72,14 +75,6 @@
mode => '0600',
require => File['/var/lib/gerrit2/.ssh'],
content => secret('gerrit/id_rsa'),
- }
-
- file { '/var/lib/gerrit2/.ssh/known_hosts':
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0600',
- require => File['/var/lib/gerrit2/.ssh'],
- source => 'puppet:///modules/gerrit/known_hosts',
}
file { '/var/lib/gerrit2/review_site':
@@ -93,9 +88,10 @@
file { '/var/lib/gerrit2/review_site/etc':
ensure => directory,
+ recurse => remote,
owner => 'gerrit2',
group => 'gerrit2',
- mode => '0755',
+ mode => '0644',
require => File['/var/lib/gerrit2/review_site'],
}
@@ -123,51 +119,13 @@
require => File['/var/lib/gerrit2/review_site/etc'],
}
- file { '/var/lib/gerrit2/review_site/etc/mail':
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0444',
- recurse => true,
- source => 'puppet:///modules/gerrit/mail',
- require => File['/var/lib/gerrit2/review_site/etc'],
- }
-
- file { '/var/lib/gerrit2/review_site/etc/GerritSite.css':
+ file { '/var/lib/gerrit2/review_site/static':
+ ensure => directory,
+ recurse => remote,
owner => 'gerrit2',
group => 'gerrit2',
mode => '0444',
- source => 'puppet:///modules/gerrit/skin/GerritSite.css',
- }
-
- file { '/var/lib/gerrit2/review_site/etc/GerritSiteHeader.html':
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0444',
- source => 'puppet:///modules/gerrit/skin/GerritSiteHeader.html',
- }
-
- file { '/var/lib/gerrit2/review_site/etc/its':
- ensure => directory,
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0755',
- source => 'puppet:///modules/gerrit/its',
- require => File['/var/lib/gerrit2/review_site/etc'],
- recurse => true,
- }
-
- file { '/var/lib/gerrit2/review_site/static/page-bkg.cache.jpg':
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0444',
- source => 'puppet:///modules/gerrit/skin/page-bkg.cache.jpg',
- }
-
- file {
'/var/lib/gerrit2/review_site/static/wikimedia-codereview-logo.cache.png':
- owner => 'gerrit2',
- group => 'gerrit2',
- mode => '0444',
- source =>
'puppet:///modules/gerrit/skin/wikimedia-codereview-logo.cache.png',
+ source => 'puppet:///modules/gerrit/static',
}
file { '/var/lib/gerrit2/review_site/lib':
--
To view, visit https://gerrit.wikimedia.org/r/300048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff8d4b47e88f62c0cc973a6031b6d07101510c51
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
