Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Use only cxserver/deploy in deployment
......................................................................
Use only cxserver/deploy in deployment
Change-Id: Ic7c626cf9d66e883391d95136bdcc4f40e6ad3ae
---
M manifests/role/deployment.pp
M modules/cxserver/manifests/init.pp
M modules/cxserver/templates/upstart.erb
3 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 1085d07..784a69c 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -109,14 +109,10 @@
'grain' => 'iegreview',
'upstream' => 'https://gerrit.wikimedia.org/r/wikimedia/iegreview',
},
- 'cxserver/cxserver' => {
- 'service_name' => 'cxserver',
- 'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/cxserver',
- },
- # TODO: cxserver/deploy ships the node_modules that cxserver needs,
- # amend this to only need one repo
- 'cxserver/deploy' => {
- 'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy',
+ 'cxserver/deploy' => {
+ 'service_name' => 'cxserver',
+ 'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy',
+ 'checkout_submodules' => true,
},
}
}
diff --git a/modules/cxserver/manifests/init.pp
b/modules/cxserver/manifests/init.pp
index 8251594..f5edae8 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -23,9 +23,9 @@
# [*port*]
# Port where to run the cxserver service. Defaults to 8080.
class cxserver(
- $base_path = '/srv/deployment/cxserver/cxserver',
+ $base_path = '/srv/deployment/cxserver/deploy',
$node_path = '/srv/deployment/cxserver/deploy/node_modules',
- $conf_path = '/srv/deployment/cxserver/cxserver/config.js',
+ $conf_path = '/srv/deployment/cxserver/deploy/src/config.js',
$log_dir = '/var/log/cxserver',
$parsoid = 'http://parsoid-lb.eqiad.wikimedia.org',
$apertium = 'http://apertium.svc.eqiad.wmnet:2737',
@@ -34,7 +34,6 @@
require_package('nodejs')
package { [
- 'cxserver/cxserver',
'cxserver/deploy',
]:
ensure => present,
diff --git a/modules/cxserver/templates/upstart.erb
b/modules/cxserver/templates/upstart.erb
index 9a21212..9673613 100644
--- a/modules/cxserver/templates/upstart.erb
+++ b/modules/cxserver/templates/upstart.erb
@@ -18,4 +18,4 @@
kill timeout 60
chdir "<%= @base_path %>"
-exec /usr/bin/nodejs Server.js >> "<%= @log_file %>" 2>&1
+exec /usr/bin/nodejs src/Server.js >> "<%= @log_file %>" 2>&1
--
To view, visit https://gerrit.wikimedia.org/r/184217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7c626cf9d66e883391d95136bdcc4f40e6ad3ae
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
