[MediaWiki-commits] [Gerrit] tcpircbot: fix multiple unreferenced var errors - change (operations/puppet)

2014-01-15 Thread Faidon Liambotis (Code Review) 
Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/107807


Change subject: tcpircbot: fix multiple unreferenced var errors
..

tcpircbot: fix multiple unreferenced var errors

The few unrelated touch-ups of commit I0e0209e were broken in multiple
ways, throwing errors because of missing dependencies.

Attempt to fix those while keeping the original commit's rationale of
removing useless parameters that noone would ever customize.

Change-Id: If6379f5c2fedd54460494b98392e4f6d96d8ef8b
---
M modules/tcpircbot/manifests/init.pp
M modules/tcpircbot/manifests/instance.pp
2 files changed, 8 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/107807/1

diff --git a/modules/tcpircbot/manifests/init.pp 
b/modules/tcpircbot/manifests/init.pp
index a39b762..de87c67 100644
--- a/modules/tcpircbot/manifests/init.pp
+++ b/modules/tcpircbot/manifests/init.pp
@@ -8,12 +8,6 @@
 #
 # === Parameters
 #
-# [*user*]
-#   Run tcpircbot instances as this system user (default: 'tcpircbot').
-#
-# [*group*]
-#   Run tcpircbot under this gid (default: 'tcpircbot').
-#
 # [*dir*]
 #   Directory for tcpircbot script and configuration files and home directory
 #   for user.
@@ -31,7 +25,10 @@
 # password = $passwords::irc::announcebot,
 #   }
 #
-class tcpircbot {
+class tcpircbot(
+$dir = '/srv/tcpircbot',
+) {
+
 package { [ 'python-irclib', 'python-netaddr' ]:
 ensure = present,
 }
@@ -42,7 +39,7 @@
 ensure = present,
 gid= 'tcpircbot',
 shell  = '/bin/false',
-home   = '/srv/tcpircbot',
+home   = $dir,
 managehome = true,
 system = true,
 }
@@ -50,8 +47,8 @@
 file { ${dir}/tcpircbot.py:
 ensure = present,
 source = 'puppet:///modules/tcpircbot/tcpircbot.py',
-owner  = $user,
-group  = $group,
+owner  = 'tcpircbot',
+group  = 'tcpircbot',
 mode   = '0555',
 }
 }
diff --git a/modules/tcpircbot/manifests/instance.pp 
b/modules/tcpircbot/manifests/instance.pp
index d321b97..9fad01b 100644
--- a/modules/tcpircbot/manifests/instance.pp
+++ b/modules/tcpircbot/manifests/instance.pp
@@ -68,7 +68,7 @@
 file { ${tcpircbot::dir}/${title}.json:
 ensure  = present,
 content = template('tcpircbot/tcpircbot.json.erb'),
-require = User[$tcpircbot::user],
+require = User['tcpircbot'],
 }
 
 file { /etc/init/tcpircbot-${title}.conf:

-- 
To view, visit https://gerrit.wikimedia.org/r/107807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If6379f5c2fedd54460494b98392e4f6d96d8ef8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] tcpircbot: fix multiple unreferenced var errors - change (operations/puppet)

2014-01-15 Thread Ori.livneh (Code Review) 
Ori.livneh has submitted this change and it was merged.

Change subject: tcpircbot: fix multiple unreferenced var errors
..


tcpircbot: fix multiple unreferenced var errors

The few unrelated touch-ups of commit I0e0209e were broken in multiple
ways, throwing errors because of missing dependencies.

Attempt to fix those while keeping the original commit's rationale of
removing useless parameters that noone would ever customize.

Change-Id: If6379f5c2fedd54460494b98392e4f6d96d8ef8b
---
M modules/tcpircbot/manifests/init.pp
M modules/tcpircbot/manifests/instance.pp
2 files changed, 8 insertions(+), 11 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tcpircbot/manifests/init.pp 
b/modules/tcpircbot/manifests/init.pp
index a39b762..de87c67 100644
--- a/modules/tcpircbot/manifests/init.pp
+++ b/modules/tcpircbot/manifests/init.pp
@@ -8,12 +8,6 @@
 #
 # === Parameters
 #
-# [*user*]
-#   Run tcpircbot instances as this system user (default: 'tcpircbot').
-#
-# [*group*]
-#   Run tcpircbot under this gid (default: 'tcpircbot').
-#
 # [*dir*]
 #   Directory for tcpircbot script and configuration files and home directory
 #   for user.
@@ -31,7 +25,10 @@
 # password = $passwords::irc::announcebot,
 #   }
 #
-class tcpircbot {
+class tcpircbot(
+$dir = '/srv/tcpircbot',
+) {
+
 package { [ 'python-irclib', 'python-netaddr' ]:
 ensure = present,
 }
@@ -42,7 +39,7 @@
 ensure = present,
 gid= 'tcpircbot',
 shell  = '/bin/false',
-home   = '/srv/tcpircbot',
+home   = $dir,
 managehome = true,
 system = true,
 }
@@ -50,8 +47,8 @@
 file { ${dir}/tcpircbot.py:
 ensure = present,
 source = 'puppet:///modules/tcpircbot/tcpircbot.py',
-owner  = $user,
-group  = $group,
+owner  = 'tcpircbot',
+group  = 'tcpircbot',
 mode   = '0555',
 }
 }
diff --git a/modules/tcpircbot/manifests/instance.pp 
b/modules/tcpircbot/manifests/instance.pp
index d321b97..9fad01b 100644
--- a/modules/tcpircbot/manifests/instance.pp
+++ b/modules/tcpircbot/manifests/instance.pp
@@ -68,7 +68,7 @@
 file { ${tcpircbot::dir}/${title}.json:
 ensure  = present,
 content = template('tcpircbot/tcpircbot.json.erb'),
-require = User[$tcpircbot::user],
+require = User['tcpircbot'],
 }
 
 file { /etc/init/tcpircbot-${title}.conf:

-- 
To view, visit https://gerrit.wikimedia.org/r/107807
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If6379f5c2fedd54460494b98392e4f6d96d8ef8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits