Dzahn has submitted this change and it was merged.
Change subject: parsoid: create module, move files and templates there
......................................................................
parsoid: create module, move files and templates there
- create a module for parsoid
- move files from files/misc to module
- move templates from templates/misc to module
No (other) changes intended.
Change-Id: Ie5786cf75d3b9110265d065eb32c70aa1178aef8
---
M manifests/role/parsoid.pp
R modules/parsoid/files/parsoid
R modules/parsoid/files/parsoid.upstart
R modules/parsoid/files/parsoid_testing.systemd.service
R modules/parsoid/files/parsoid_testing.update_parsoid.sh
R modules/parsoid/files/ruthenium.nginx.conf
R modules/parsoid/templates/parsoid.default.erb
R modules/parsoid/templates/parsoid.logrotate.erb
R modules/parsoid/templates/parsoid.vcl.erb
9 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 463c18e..16fb67c 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -19,7 +19,7 @@
owner => root,
group => root,
mode => '0555',
- source => 'puppet:///files/misc/parsoid',
+ source => 'puppet:///modules/parsoid/parsoid',
}
ferm::service { 'parsoid':
@@ -65,7 +65,7 @@
owner => root,
group => root,
mode => '0444',
- source => 'puppet:///files/misc/parsoid.upstart',
+ source => 'puppet:///modules/parsoid/parsoid.upstart',
}
file { '/var/log/parsoid':
@@ -88,7 +88,7 @@
owner => root,
group => root,
mode => '0444',
- content => template('misc/parsoid.default.erb'),
+ content => template('parsoid/parsoid.default.erb'),
require => File['/var/log/parsoid'],
}
@@ -97,7 +97,7 @@
owner => root,
group => root,
mode => '0444',
- content => template('misc/parsoid.logrotate.erb'),
+ content => template('parsoid/parsoid.logrotate.erb'),
}
cron { 'parsoid-hourly-logrot':
@@ -191,7 +191,7 @@
owner => root,
group => root,
mode => '0444',
- source => 'puppet:///files/misc/parsoid.upstart',
+ source => 'puppet:///modules/parsoid/parsoid.upstart',
}
$parsoid_log_file = '/data/project/parsoid/parsoid.log'
@@ -220,7 +220,7 @@
owner => root,
group => root,
mode => '0444',
- content => template('misc/parsoid.default.erb'),
+ content => template('parsoid/parsoid.default.erb'),
require => File['/data/project/parsoid'],
}
@@ -229,7 +229,7 @@
owner => root,
group => root,
mode => '0444',
- content => template('misc/parsoid.logrotate.erb'),
+ content => template('parsoid/parsoid.logrotate.erb'),
}
service { 'parsoid':
@@ -290,7 +290,7 @@
}
file { '/lib/systemd/system/parsoid.service':
- source => 'puppet:///files/misc/parsoid_testing.systemd.service',
+ source => 'puppet:///modules/parsoid/parsoid_testing.systemd.service',
owner => 'root',
group => 'root',
mode => '0444',
@@ -306,7 +306,7 @@
}
file { '/usr/local/bin/update_parsoid.sh':
- source => 'puppet:///files/misc/parsoid_testing.update_parsoid.sh',
+ source =>
'puppet:///modules/parsoid/parsoid_testing.update_parsoid.sh',
owner => 'root',
group => 'root',
mode => '0555',
diff --git a/files/misc/parsoid b/modules/parsoid/files/parsoid
similarity index 100%
rename from files/misc/parsoid
rename to modules/parsoid/files/parsoid
diff --git a/files/misc/parsoid.upstart b/modules/parsoid/files/parsoid.upstart
similarity index 100%
rename from files/misc/parsoid.upstart
rename to modules/parsoid/files/parsoid.upstart
diff --git a/files/misc/parsoid_testing.systemd.service
b/modules/parsoid/files/parsoid_testing.systemd.service
similarity index 100%
rename from files/misc/parsoid_testing.systemd.service
rename to modules/parsoid/files/parsoid_testing.systemd.service
diff --git a/files/misc/parsoid_testing.update_parsoid.sh
b/modules/parsoid/files/parsoid_testing.update_parsoid.sh
similarity index 100%
rename from files/misc/parsoid_testing.update_parsoid.sh
rename to modules/parsoid/files/parsoid_testing.update_parsoid.sh
diff --git a/files/misc/ruthenium.nginx.conf
b/modules/parsoid/files/ruthenium.nginx.conf
similarity index 100%
rename from files/misc/ruthenium.nginx.conf
rename to modules/parsoid/files/ruthenium.nginx.conf
diff --git a/templates/misc/parsoid.default.erb
b/modules/parsoid/templates/parsoid.default.erb
similarity index 100%
rename from templates/misc/parsoid.default.erb
rename to modules/parsoid/templates/parsoid.default.erb
diff --git a/templates/misc/parsoid.logrotate.erb
b/modules/parsoid/templates/parsoid.logrotate.erb
similarity index 100%
rename from templates/misc/parsoid.logrotate.erb
rename to modules/parsoid/templates/parsoid.logrotate.erb
diff --git a/templates/misc/parsoid.vcl.erb
b/modules/parsoid/templates/parsoid.vcl.erb
similarity index 100%
rename from templates/misc/parsoid.vcl.erb
rename to modules/parsoid/templates/parsoid.vcl.erb
--
To view, visit https://gerrit.wikimedia.org/r/269602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5786cf75d3b9110265d065eb32c70aa1178aef8
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
