Ori.livneh has submitted this change and it was merged.
Change subject: Migrate parsoid::role::testing service from upstart to systemd
......................................................................
Migrate parsoid::role::testing service from upstart to systemd
Change-Id: I093ef1f73b61d86753538836e361707c6b58e008
---
A files/misc/parsoid.systemd.service
M manifests/role/parsoid.pp
2 files changed, 29 insertions(+), 24 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
Mobrovac: Looks good to me, but someone else must approve
diff --git a/files/misc/parsoid.systemd.service
b/files/misc/parsoid.systemd.service
new file mode 100644
index 0000000..e3ef662
--- /dev/null
+++ b/files/misc/parsoid.systemd.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=parsoid-vd: Testreduce HTTP service for visual-diff results
+After=network.target
+
+[Service]
+User=parsoid
+Group=parsoid
+LimitNOFILE=10K
+
+Environment=NODE_PATH=/usr/lib/parsoid/deploy/node_modules VCAP_APP_PORT=8000
+WorkingDirectory=/usr/lib/parsoid/deploy/src
+ExecStart=node bin/server.js -c /usr/lib/parsoid/deploy/src/localsettings.js
+StandardInput=null
+StandardOutput=journal
+StandardError=journal
+RestartSec=2
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index a38e3a8..96d771f 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -285,46 +285,35 @@
before => Service['parsoid'],
}
- file { '/etc/init/parsoid.conf':
- ensure => present,
- owner => root,
- group => root,
+ file { '/lib/systemd/system/parsoid.service':
+ source => 'puppet:///files/misc/parsoid.systemd.service',
+ owner => 'root',
+ group => 'root',
mode => '0444',
- source => 'puppet:///files/misc/parsoid.upstart',
before => Service['parsoid'],
}
file { '/var/log/parsoid':
ensure => directory,
- owner => parsoid,
- group => parsoid,
+ owner => 'parsoid',
+ group => 'parsoid',
mode => '0775',
before => Service['parsoid'],
}
- $parsoid_log_file = '/var/log/parsoid/parsoid.log'
- $parsoid_node_path = '/usr/lib/parsoid/deploy/node_modules'
- # default local settings -- test setups provide their own settings
- $parsoid_settings_file = '/usr/lib/parsoid/src/localsettings.js'
- $parsoid_base_path = '/usr/lib/parsoid/deploy/src'
-
- #TODO: Duplication of code, deduplicate somehow
- file { '/etc/default/parsoid':
- ensure => present,
- owner => root,
- group => root,
- mode => '0444',
- content => template('misc/parsoid.default.erb'),
- before => Service['parsoid'],
+ # Use the default settings file for the parsoid service.
+ # Can tweak this later if necessary.
+ file { '/usr/lib/parsoid/deploy/src/localsettings.js':
+ ensure => link,
+ target => '/usr/lib/parsoid/deploy/src/localsettings.js.example',
+ before => Service['parsoid'],
}
service { 'parsoid':
hasstatus => true,
hasrestart => true,
- provider => 'upstart',
subscribe => [
- File['/etc/default/parsoid'],
- File['/etc/init/parsoid.conf'],
+ File['/lib/systemd/system/parsoid.service'],
],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I093ef1f73b61d86753538836e361707c6b58e008
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Mobrovac <[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
