[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab/aphlict: ensure aphlict group always exists

2017-09-20 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/379439 )

Change subject: phab/aphlict: ensure aphlict group always exists
..


phab/aphlict: ensure aphlict group always exists

Ensure the group always exists, whether aphlict is
enabled or not, otherwise we don't get the group
on non-active server (ensure => absent) while the
class is still trying to create the user
which will fail without the group.

Also revert Ia9b72f9caf26fb5cc2

Bug: T765
Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 6 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index 6db523f..d6c6a01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -68,15 +68,16 @@
 
 # accounts
 group { $group:
-ensure => $ensure,
+ensure => 'present',
 system => true,
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: phab/aphlict: ensure aphlict group always exists

2017-09-20 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/379439 )

Change subject: phab/aphlict: ensure aphlict group always exists
..

phab/aphlict: ensure aphlict group always exists

Ensure the group always exists, whether aphlict is
enabled or not, otherwise we don't get the group
on non-active server (ensure => absent) while the
class is still trying to create the user
which will fail without the group.

Also revert Ia9b72f9caf26fb5cc2

Bug: T765
Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
---
M modules/phabricator/manifests/aphlict.pp
1 file changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/379439/1

diff --git a/modules/phabricator/manifests/aphlict.pp 
b/modules/phabricator/manifests/aphlict.pp
index 6db523f..d6c6a01 100644
--- a/modules/phabricator/manifests/aphlict.pp
+++ b/modules/phabricator/manifests/aphlict.pp
@@ -68,15 +68,16 @@
 
 # accounts
 group { $group:
-ensure => $ensure,
+ensure => 'present',
 system => true,
 }
 
 user { $user:
-gid=> $group,
-shell  => '/bin/false',
-home   => '/var/run/aphlict',
-system => true,
+gid => $group,
+shell   => '/bin/false',
+home=> '/var/run/aphlict',
+system  => true,
+require => Group[$group],
 }
 
 base::service_unit { 'aphlict':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I730f935d68db61211f92ffde7995242af7c9ed1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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