diff options
| author | Micah Anderson <micah@riseup.net> | 2016-08-31 19:38:21 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-08-31 19:38:21 -0400 |
| commit | fa2dfed639d83fb67e99071cd9e135835d0f65eb (patch) | |
| tree | 69d43c125dc27e325ac2ac052f10a4b06ea381ef /puppet/modules/soledad/manifests/server.pp | |
| parent | 1d8236ec76d0aa0aca0171abd82b1a63450c8321 (diff) | |
| parent | 9ef0d00b4302b7ddfc9d5620eeb4fad90d3a15aa (diff) | |
Merge remote-tracking branch 'varac/remove_soledad_procs_check' into develop
Diffstat (limited to 'puppet/modules/soledad/manifests/server.pp')
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/puppet/modules/soledad/manifests/server.pp b/puppet/modules/soledad/manifests/server.pp index 6cf806d0..81f51188 100644 --- a/puppet/modules/soledad/manifests/server.pp +++ b/puppet/modules/soledad/manifests/server.pp @@ -2,8 +2,9 @@ class soledad::server { tag 'leap_service' - include site_config::default - include soledad::common + include ::site_config::default + include ::soledad::common + include ::site_config::remove::soledad $soledad = hiera('soledad') $couchdb_user = $soledad['couchdb_soledad_user']['username'] @@ -90,11 +91,11 @@ class soledad::server { } user { 'soledad': - ensure => present, - system => true, - gid => 'soledad', - home => '/srv/leap/soledad', - require => Group['soledad']; + ensure => present, + system => true, + gid => 'soledad', + home => '/srv/leap/soledad', + require => Group['soledad']; 'soledad-admin': ensure => present, system => true, |