Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156957
Change subject: Moved ::mediawiki::sync to the Openstack manager class.
......................................................................
Moved ::mediawiki::sync to the Openstack manager class.
Less host-specific is better, plus this makes for a clearer
definition of /a
bug: 68751
bug: 62496
Change-Id: I6b175b49c448c1979117d62ec07a50f6902848e6
---
M manifests/openstack.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/156957/1
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 8b521d8..6662a77 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -368,6 +368,10 @@
content => template("apache/sites/${webserver_hostname}.erb"),
}
+ # ::mediawiki::sync supports syncing the wikitech wiki from tin.
+ # It also defines /a which is used later on in this manifest for backups.
+ include ::mediawiki::sync
+
file {
"/var/www/robots.txt":
ensure => present,
@@ -375,11 +379,6 @@
owner => 'root',
group => 'root',
source => "puppet:///files/openstack/wikitech-robots.txt";
- "/a":
- mode => '0755',
- owner => 'root',
- group => 'root',
- ensure => directory;
"/a/backup":
mode => '0755',
owner => 'root',
diff --git a/manifests/site.pp b/manifests/site.pp
index c2d11f8..15a6280 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2905,7 +2905,6 @@
include role::nova::manager
include role::salt::masters::labs
include role::deployment::salt_masters::labs
- include ::mediawiki::sync
if $use_neutron == true {
include role::neutron::controller
}
--
To view, visit https://gerrit.wikimedia.org/r/156957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b175b49c448c1979117d62ec07a50f6902848e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
