Ryan Lane has submitted this change and it was merged.
Change subject: contint: puppet doc now handled by Jenkins
......................................................................
contint: puppet doc now handled by Jenkins
The puppet documentation is now handled by Jenkins. This patch:
* removes the puppet classe misc::docs::puppet which was used to
generate the documentation on gallium.
* move misc::docsite under the contint module which would thus now
manage doc.wikimedia.org
* /srv/org/wikimedia/doc now belongs to jenkins:jenkins and group
writable.
Change-Id: I1a503f65ea15e160ae4b5e1a8110c5bfba37a348
---
D manifests/misc/docs.pp
M manifests/site.pp
R modules/contint/files/apache/doc.wikimedia.org
M modules/contint/manifests/website.pp
4 files changed, 20 insertions(+), 35 deletions(-)
Approvals:
Ryan Lane: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/docs.pp b/manifests/misc/docs.pp
deleted file mode 100644
index 01d8316..0000000
--- a/manifests/misc/docs.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class misc::docsite {
- system_role { "misc::docsite": description => "doc site server" }
- file {
- '/etc/apache2/sites-available/doc.wikimedia.org':
- path =>
'/etc/apache2/sites-available/doc.wikimedia.org',
- mode => 0444,
- owner => root,
- group => root,
- source =>
'puppet:///files/apache/sites/doc.wikimedia.org';
- '/srv/org/wikimedia/doc':
- ensure => 'directory';
- }
-
- apache_site { docs: name => 'doc.wikimedia.org' }
-}
-
-class misc::docs::puppet {
-
- git::clone { "puppetsource":
- directory => "/srv/org/wikimedia/doc/puppetsource",
- branch => "master",
- ensure => latest,
- origin => "https://gerrit.wikimedia.org/r/p/operations/puppet";;
- }
-
- exec { "generate puppet docsite":
- require => git::clone['puppetsource'],
- command => "/usr/bin/puppet doc --mode rdoc --outputdir
/srv/org/wikimedia/doc/puppet --modulepath
/srv/org/wikimedia/doc/puppetsource/modules --manifestdir
/srv/org/wikimedia/doc/puppetsource/manifests",
- }
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 62d3bce..2295bee 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -846,8 +846,6 @@
misc::contint::test::packages,
misc::contint::test::jenkins,
misc::contint::android::sdk,
- misc::docsite,
- misc::docs::puppet,
role::zuul::production,
admins::roots,
admins::jenkins
diff --git a/files/apache/sites/doc.wikimedia.org
b/modules/contint/files/apache/doc.wikimedia.org
similarity index 100%
rename from files/apache/sites/doc.wikimedia.org
rename to modules/contint/files/apache/doc.wikimedia.org
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 1dbcf60..58cec15 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -1,10 +1,10 @@
# Class for website hosted on the continuous integration server
# https://integration.mediawiki.org/
# https://doc.wikimedia.org/
-# https://doc.mediawiki.org/
class contint::website {
- # This is mostly to get the files properly setup
+ # Static files in these docroots are in integration/docroot.git
+
file { '/srv/org':
ensure => directory,
mode => '0775',
@@ -54,6 +54,24 @@
name => 'integration.mediawiki.org',
}
+ # Written to by jenkins for automatically generated
+ # documentations
+ file { '/srv/org/wikimedia/doc':
+ ensure => directory,
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
+ }
+ file { '/etc/apache2/sites-available/doc.wikimedia.org':
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ source => 'puppet:///modules/contint/apache/doc.wikimedia.org',
+ }
+ apache_site { 'doc.wikimedia.org':
+ name => 'doc.wikimedia.org',
+ }
+
file { '/srv/localhost':
ensure => directory,
mode => '0775',
--
To view, visit https://gerrit.wikimedia.org/r/53958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a503f65ea15e160ae4b5e1a8110c5bfba37a348
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
