summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/soledad/manifests')
-rw-r--r--puppet/modules/soledad/manifests/server.pp15
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,