Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337827 )
Change subject: phabricator database: Move templates to the role
......................................................................
phabricator database: Move templates to the role
Because templates dir is deprecated, move away the related files.
Make sure we do not break anything in the process.
Change-Id: I96a38bb257154c8c6b4d8b07573729d89d8c8498
---
M modules/role/manifests/mariadb.pp
R modules/role/templates/phabricator/init.sql.erb
R modules/role/templates/phabricator/stopwords-update.sql.erb
R modules/role/templates/phabricator/stopwords.txt.erb
4 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/role/manifests/mariadb.pp
b/modules/role/manifests/mariadb.pp
index 769a00d..6c8eca0 100644
--- a/modules/role/manifests/mariadb.pp
+++ b/modules/role/manifests/mariadb.pp
@@ -313,7 +313,7 @@
owner => 'root',
group => 'root',
mode => '0644',
- content => template('mariadb/phabricator-stopwords.txt.erb'),
+ content => template('role/phabricator/stopwords.txt.erb'),
}
file { '/etc/mysql/phabricator-stopwords-update.sql':
@@ -321,7 +321,7 @@
owner => 'root',
group => 'root',
mode => '0644',
- content => template('mariadb/phabricator-stopwords-update.sql.erb'),
+ content => template('role/phabricator/stopwords-update.sql.erb'),
}
file { '/etc/mysql/phabricator-init.sql':
@@ -329,7 +329,7 @@
owner => 'root',
group => 'root',
mode => '0644',
- content => template('mariadb/phabricator-init.sql.erb'),
+ content => template('role/phabricator/init.sql.erb'),
}
class { 'role::mariadb::grants::production':
diff --git a/templates/mariadb/phabricator-init.sql.erb
b/modules/role/templates/phabricator/init.sql.erb
similarity index 100%
rename from templates/mariadb/phabricator-init.sql.erb
rename to modules/role/templates/phabricator/init.sql.erb
diff --git a/templates/mariadb/phabricator-stopwords-update.sql.erb
b/modules/role/templates/phabricator/stopwords-update.sql.erb
similarity index 100%
rename from templates/mariadb/phabricator-stopwords-update.sql.erb
rename to modules/role/templates/phabricator/stopwords-update.sql.erb
diff --git a/templates/mariadb/phabricator-stopwords.txt.erb
b/modules/role/templates/phabricator/stopwords.txt.erb
similarity index 100%
rename from templates/mariadb/phabricator-stopwords.txt.erb
rename to modules/role/templates/phabricator/stopwords.txt.erb
--
To view, visit https://gerrit.wikimedia.org/r/337827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96a38bb257154c8c6b4d8b07573729d89d8c8498
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
