Ori.livneh has submitted this change and it was merged.
Change subject: Standardize declaration of nodejs package
......................................................................
Standardize declaration of nodejs package
Change-Id: I9d483339e6876f02f248343b546fcd0e60f4c176
---
M modules/citoid/manifests/init.pp
M modules/contint/manifests/packages.pp
M modules/cxserver/manifests/init.pp
M modules/limn/manifests/init.pp
M modules/mathoid/manifests/init.pp
M modules/ocg/manifests/init.pp
6 files changed, 10 insertions(+), 17 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/citoid/manifests/init.pp b/modules/citoid/manifests/init.pp
index 2dd7431..c849a92 100644
--- a/modules/citoid/manifests/init.pp
+++ b/modules/citoid/manifests/init.pp
@@ -8,7 +8,7 @@
# Port where to run the citoid service. Defaults to 1970.
#
class citoid( $port = 1970 ) {
- ensure_packages( ['nodejs'] )
+ require_package('nodejs')
package { 'citoid/deploy':
provider => 'trebuchet',
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index b102eee..b510f53 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -103,9 +103,7 @@
}
# Node.js evolves quickly so we want to update automatically.
- package { 'nodejs':
- ensure => latest,
- }
+ require_package('nodejs')
# Includes packages needed for building
diff --git a/modules/cxserver/manifests/init.pp
b/modules/cxserver/manifests/init.pp
index 72be395..a9ce1d6 100644
--- a/modules/cxserver/manifests/init.pp
+++ b/modules/cxserver/manifests/init.pp
@@ -35,8 +35,9 @@
) {
# apertium-* packages are for machine translation.
# dictd-* packages for dictionary server.
- package { ['nodejs',
- 'dictd',
+ require_package('nodejs')
+
+ package { ['dictd',
'dict-freedict-eng-spa',
'dict-freedict-spa-eng',
'dict-freedict-eng-hin'
diff --git a/modules/limn/manifests/init.pp b/modules/limn/manifests/init.pp
index 61d01d9..e1fe163 100644
--- a/modules/limn/manifests/init.pp
+++ b/modules/limn/manifests/init.pp
@@ -18,11 +18,7 @@
$group = 'limn'
# Make sure nodejs is installed.
- if (!defined(Package['nodejs'])) {
- package { 'nodejs':
- ensure => installed,
- }
- }
+ require_package('nodejs')
group { $group:
ensure => present,
@@ -59,4 +55,4 @@
mode => '0755',
require => [User[$user], Group[$group]],
}
-}
\ No newline at end of file
+}
diff --git a/modules/mathoid/manifests/init.pp
b/modules/mathoid/manifests/init.pp
index 5ad6151..1e3314a 100644
--- a/modules/mathoid/manifests/init.pp
+++ b/modules/mathoid/manifests/init.pp
@@ -23,7 +23,7 @@
$log_dir,
$port=10042
) {
- ensure_packages( ['nodejs'] )
+ require_package('nodejs')
# TODO Add dependency to node-jsdom once
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742347
# is fixed
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index d1dea30..d98f4be 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -45,10 +45,8 @@
if ( $::lsbdistid == 'Ubuntu' and versioncmp($::lsbdistrelease, '14.04')
>= 0 ) {
# Although we need NodeJS on the server, only ubuntu 14.04 currently
# comes with it. On labs or 12.04 boxes it has to be installed by hand
:(
- package { 'nodejs':
- ensure => present,
- notify => Service['ocg'],
- }
+ require_package('nodejs')
+ Package['nodejs'] ~> Service['ocg']
}
# NOTE: If you change $nodebin you MUST also change the AppArmor
--
To view, visit https://gerrit.wikimedia.org/r/167838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d483339e6876f02f248343b546fcd0e60f4c176
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
