Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53958
Change subject: contint: Move docs.pp into contint
......................................................................
contint: Move docs.pp into contint
Change-Id: I1a503f65ea15e160ae4b5e1a8110c5bfba37a348
---
D manifests/misc/docs.pp
M manifests/site.pp
R modules/contint/files/apache/doc.wikimedia.org
A modules/contint/manifests/docs.pp
M modules/contint/manifests/website.pp
5 files changed, 38 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/53958/1
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 4dc3fc5..03f8512 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -782,7 +782,6 @@
misc::contint::test::packages,
misc::contint::test::jenkins,
misc::contint::android::sdk,
- misc::docsite,
misc::docs::puppet,
role::zuul::production,
admins::roots,
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/docs.pp
b/modules/contint/manifests/docs.pp
new file mode 100644
index 0000000..3a4c804
--- /dev/null
+++ b/modules/contint/manifests/docs.pp
@@ -0,0 +1,15 @@
+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/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 0616d06..013d690 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 => '0755',
@@ -25,6 +25,7 @@
group => 'wikidev',
}
# MediaWiki code coverage
+ # Written to by jenkins
file { '/srv/org/mediawiki/integration/coverage':
ensure => directory,
mode => '0775',
@@ -50,6 +51,26 @@
group => 'wikidev',
}
+ # Written to by jenkins for mediawiki-core docs
+ # Written to by misc::docs::puppet for puppet docs
+ file { '/srv/org/wikimedia/doc':
+ ensure => directory,
+ mode => '0755',
+ owner => 'www-data',
+ group => 'wikidev',
+ }
+
+ 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 => '0755',
--
To view, visit https://gerrit.wikimedia.org/r/53958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a503f65ea15e160ae4b5e1a8110c5bfba37a348
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
