diff options
| author | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
| commit | 34a381efa8f6295080c843f86bfa07d4e41056af (patch) | |
| tree | 9282cf5d4c876688602705a7fa0002bc4a810bde /puppet/modules/soledad/manifests | |
| parent | 0a72bc6fd292bf9367b314fcb0347c4d35042f16 (diff) | |
| parent | 5821964ff7e16ca7aa9141bd09a77d355db492a9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/soledad/manifests')
| -rw-r--r-- | puppet/modules/soledad/manifests/common.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/soledad/manifests/server.pp | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/puppet/modules/soledad/manifests/common.pp b/puppet/modules/soledad/manifests/common.pp index 8d8339d4..35969362 100644 --- a/puppet/modules/soledad/manifests/common.pp +++ b/puppet/modules/soledad/manifests/common.pp @@ -1,6 +1,9 @@ # install soledad-common, both needed both soledad-client and soledad-server class soledad::common { + # install twisted from jessie backports + include ::site_apt::preferences::twisted + package { 'soledad-common': ensure => latest; } 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, |