BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277421
Change subject: Move wikitech role support files to role module
......................................................................
Move wikitech role support files to role module
Change-Id: I62ea3e6db203f75fca8b33b3731e79b8b526f1ec
---
R puppet/modules/role/files/wikitech/initial-pages.xml
M puppet/modules/role/manifests/wikitech.pp
R puppet/modules/role/templates/wikitech/Debug.php.erb
R puppet/modules/role/templates/wikitech/LdapAuth.php.erb
R puppet/modules/role/templates/wikitech/Local.php.erb
R puppet/modules/role/templates/wikitech/Private.php.erb
6 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/21/277421/1
diff --git a/puppet/modules/wikitech/files/wikitech-initial-pages.xml
b/puppet/modules/role/files/wikitech/initial-pages.xml
similarity index 100%
rename from puppet/modules/wikitech/files/wikitech-initial-pages.xml
rename to puppet/modules/role/files/wikitech/initial-pages.xml
diff --git a/puppet/modules/role/manifests/wikitech.pp
b/puppet/modules/role/manifests/wikitech.pp
index 2fb4a82..c86a59b 100644
--- a/puppet/modules/role/manifests/wikitech.pp
+++ b/puppet/modules/role/manifests/wikitech.pp
@@ -25,22 +25,22 @@
mediawiki::extension { 'LdapAuthentication':
needs_update => true,
- settings => template('wikitech/LdapAuth.php.erb'),
+ settings => template('role/wikitech/LdapAuth.php.erb'),
}
# General wiki settings, OSM config
mediawiki::settings { 'WikitechLocalSettings':
- values => template('wikitech/Local.php.erb'),
+ values => template('role/wikitech/Local.php.erb'),
}
# Secret OSM passwords (will need to change on the fly for
# OpenStack integration).
mediawiki::settings { 'WikitechPrivateSettings':
- values => template('wikitech/Private.php.erb'),
+ values => template('role/wikitech/Private.php.erb'),
}
mediawiki::settings { 'WikitechDebugSettings':
- values => template('wikitech/Debug.php.erb'),
+ values => template('role/wikitech/Debug.php.erb'),
}
mediawiki::extension { [
@@ -58,7 +58,7 @@
}
mediawiki::import::dump { 'wikitech_content':
- xml_dump =>
'/vagrant/puppet/modules/wikitech/files/wikitech-initial-pages.xml',
+ xml_dump =>
'/vagrant/puppet/modules/role/files/wikitech/initial-pages.xml',
dump_sentinel_page => 'Shell_Request/Andrew',
}
}
diff --git a/puppet/modules/wikitech/templates/Debug.php.erb
b/puppet/modules/role/templates/wikitech/Debug.php.erb
similarity index 100%
rename from puppet/modules/wikitech/templates/Debug.php.erb
rename to puppet/modules/role/templates/wikitech/Debug.php.erb
diff --git a/puppet/modules/wikitech/templates/LdapAuth.php.erb
b/puppet/modules/role/templates/wikitech/LdapAuth.php.erb
similarity index 100%
rename from puppet/modules/wikitech/templates/LdapAuth.php.erb
rename to puppet/modules/role/templates/wikitech/LdapAuth.php.erb
diff --git a/puppet/modules/wikitech/templates/Local.php.erb
b/puppet/modules/role/templates/wikitech/Local.php.erb
similarity index 100%
rename from puppet/modules/wikitech/templates/Local.php.erb
rename to puppet/modules/role/templates/wikitech/Local.php.erb
diff --git a/puppet/modules/wikitech/templates/Private.php.erb
b/puppet/modules/role/templates/wikitech/Private.php.erb
similarity index 100%
rename from puppet/modules/wikitech/templates/Private.php.erb
rename to puppet/modules/role/templates/wikitech/Private.php.erb
--
To view, visit https://gerrit.wikimedia.org/r/277421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62ea3e6db203f75fca8b33b3731e79b8b526f1ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
