summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------puppet/modules/couchdb0
-rw-r--r--puppet/modules/leap/manifests/cli/install.pp2
-rw-r--r--puppet/modules/site_apache/manifests/common.pp6
-rw-r--r--puppet/modules/site_check_mk/manifests/agent.pp8
-rw-r--r--puppet/modules/site_couchdb/manifests/init.pp1
-rw-r--r--puppet/modules/site_couchdb/manifests/plain.pp3
-rwxr-xr-xtests/helpers/soledad_sync.py8
-rwxr-xr-xvagrant/configure-leap.sh4
-rwxr-xr-xvagrant/install-platform.pp7
9 files changed, 22 insertions, 17 deletions
diff --git a/puppet/modules/couchdb b/puppet/modules/couchdb
-Subproject b2dada713dd3486dec8eaf9bdcd1e223c9297f6
+Subproject 53a4c75ae09feb6d89b3535886663356d9ef428
diff --git a/puppet/modules/leap/manifests/cli/install.pp b/puppet/modules/leap/manifests/cli/install.pp
index 6a12a4a5..25e87033 100644
--- a/puppet/modules/leap/manifests/cli/install.pp
+++ b/puppet/modules/leap/manifests/cli/install.pp
@@ -4,7 +4,6 @@ class leap::cli::install ( $source = false ) {
# needed for building leap_cli from source
include ::git
include ::rubygems
- include ::site_config::packages::build_essential
class { '::ruby':
install_dev => true
@@ -14,7 +13,6 @@ class leap::cli::install ( $source = false ) {
Class[Ruby] ->
Class[rubygems] ->
- Class[::site_config::packages::build_essential] ->
Class[bundler::install]
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index dadf7ea5..8a11759a 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -4,7 +4,11 @@ class site_apache::common {
include apache::module::rewrite
include apache::module::env
- class { '::apache': no_default_site => true, ssl => true }
+ class { '::apache':
+ no_default_site => true,
+ ssl => true,
+ ssl_cipher_suite => 'HIGH:MEDIUM:!aNULL:!MD5'
+ }
# needed for the mod_ssl config
include apache::module::mime
diff --git a/puppet/modules/site_check_mk/manifests/agent.pp b/puppet/modules/site_check_mk/manifests/agent.pp
index 589041eb..8d8ab814 100644
--- a/puppet/modules/site_check_mk/manifests/agent.pp
+++ b/puppet/modules/site_check_mk/manifests/agent.pp
@@ -1,9 +1,14 @@
+# installs check-mk agent
class site_check_mk::agent {
$ssh_hash = hiera('ssh')
$pubkey = $ssh_hash['authorized_keys']['monitor']['key']
$type = $ssh_hash['authorized_keys']['monitor']['type']
+
+ # /usr/bin/mk-job depends on /usr/bin/time
+ ensure_packages('time')
+
class { 'site_apt::preferences::check_mk': } ->
class { 'check_mk::agent':
@@ -11,7 +16,8 @@ class site_check_mk::agent {
agent_logwatch_package_name => 'check-mk-agent-logwatch',
method => 'ssh',
homedir => '/etc/nagios/check_mk',
- register_agent => false
+ register_agent => false,
+ require => Package['time']
} ->
class { 'site_check_mk::agent::mrpe': } ->
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp
index 3f670ed2..c4fe6277 100644
--- a/puppet/modules/site_couchdb/manifests/init.pp
+++ b/puppet/modules/site_couchdb/manifests/init.pp
@@ -38,7 +38,6 @@ class site_couchdb {
$couchdb_backup = $couchdb_config['backup']
$couchdb_mode = $couchdb_config['mode']
- $couchdb_pwhash_alg = $couchdb_config['pwhash_alg']
# ensure bigcouch has been purged from the system:
# TODO: remove this check in 0.9 release
diff --git a/puppet/modules/site_couchdb/manifests/plain.pp b/puppet/modules/site_couchdb/manifests/plain.pp
index 9338e56a..b40fc100 100644
--- a/puppet/modules/site_couchdb/manifests/plain.pp
+++ b/puppet/modules/site_couchdb/manifests/plain.pp
@@ -3,8 +3,7 @@ class site_couchdb::plain {
class { 'couchdb':
admin_pw => $site_couchdb::couchdb_admin_pw,
admin_salt => $site_couchdb::couchdb_admin_salt,
- chttpd_bind_address => '127.0.0.1',
- pwhash_alg => 'pbkdf2'
+ chttpd_bind_address => '127.0.0.1'
}
include site_check_mk::agent::couchdb::plain
diff --git a/tests/helpers/soledad_sync.py b/tests/helpers/soledad_sync.py
index b8e8fbc9..f4fc81ae 100755
--- a/tests/helpers/soledad_sync.py
+++ b/tests/helpers/soledad_sync.py
@@ -17,6 +17,7 @@ It takes 5 arguments:
__author__: kali@leap.se
"""
import os
+import shutil
import sys
import tempfile
@@ -56,8 +57,13 @@ def create_docs(soledad):
if __name__ == '__main__':
tempdir = tempfile.mkdtemp()
+
+ def rm_tempdir():
+ shutil.rmtree(tempdir)
+
if len(sys.argv) < 6:
bail(USAGE, 2)
+
uuid, token, server, cert_file, passphrase = sys.argv[1:]
s = get_soledad_instance(
uuid, passphrase, tempdir, server, cert_file, token)
@@ -65,10 +71,12 @@ if __name__ == '__main__':
def onSyncDone(sync_result):
print "SYNC_RESULT:", sync_result
s.close()
+ rm_tempdir()
reactor.stop()
def log_and_exit(f):
log.err(f)
+ rm_tempdir()
reactor.stop()
def start_sync():
diff --git a/vagrant/configure-leap.sh b/vagrant/configure-leap.sh
index b22756de..8751c763 100755
--- a/vagrant/configure-leap.sh
+++ b/vagrant/configure-leap.sh
@@ -24,7 +24,7 @@ chown ${USER}:${USER} ${PROVIDERDIR}
cd $PROVIDERDIR
$LEAP $OPTS new --contacts "$contacts" --domain "$provider_domain" --name "$provider_name" --platform=/vagrant .
-$SUDO echo -e '\n@log = "/var/log/leap/deploy.log"' >> Leapfile
+echo -e '\n@log = "./deploy.log"' >> Leapfile
if [ ! -e /home/${USER}/.ssh/id_rsa ]; then
$SUDO ssh-keygen -f /home/${USER}/.ssh/id_rsa -P ''
@@ -61,10 +61,8 @@ gem install rake
$LEAP $OPTS -v 2 deploy
-set +e
$GIT add .
$GIT commit -m'initialized and deployed provider'
-set -e
# Vagrant: leap_mx fails to start on jessie
# https://leap.se/code/issues/7755
diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 8d177156..223853c1 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -1,13 +1,6 @@
class {'apt': }
Exec['update_apt'] -> Package <||>
-
-if $::lsbdistcodename == 'wheezy' {
- package { 'ruby-hiera-puppet':
- ensure => installed
- }
-}
-
# install leap_cli from source, so it will work with the develop
# branch of leap_platform
class { '::leap::cli::install':