summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/leap_cli/commands/db.rb1
-rw-r--r--provider_base/common.json5
-rw-r--r--provider_base/services/couchdb.json5
-rw-r--r--puppet/modules/site_config/manifests/remove/tapicero.pp12
-rw-r--r--tests/white-box/couchdb.rb3
-rw-r--r--tests/white-box/webapp.rb2
6 files changed, 10 insertions, 18 deletions
diff --git a/lib/leap_cli/commands/db.rb b/lib/leap_cli/commands/db.rb
index e4fd3858..5703e4bd 100644
--- a/lib/leap_cli/commands/db.rb
+++ b/lib/leap_cli/commands/db.rb
@@ -40,7 +40,6 @@ module LeapCli; module Commands
def destroy_all_dbs(nodes)
ssh_connect(nodes) do |ssh|
ssh.run('/etc/init.d/bigcouch stop && test ! -z "$(ls /opt/bigcouch/var/lib/ 2> /dev/null)" && rm -r /opt/bigcouch/var/lib/* && echo "db destroyed" || echo "db already destroyed"')
- ssh.run('grep ^seq_dir /etc/leap/tapicero.yaml | cut -f2 -d\" | xargs rm -rv')
end
end
diff --git a/provider_base/common.json b/provider_base/common.json
index 9cc7875a..5821789b 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -83,11 +83,6 @@
"package": "soledad-server",
"revision": "latest"
},
- "tapicero": {
- "type": "git",
- "source": "https://leap.se/git/tapicero",
- "revision": "origin/version/0.7"
- },
"webapp": {
"type": "git",
"source": "https://leap.se/git/leap_web",
diff --git a/provider_base/services/couchdb.json b/provider_base/services/couchdb.json
index 8b1386f8..5e65b2ec 100644
--- a/provider_base/services/couchdb.json
+++ b/provider_base/services/couchdb.json
@@ -31,11 +31,6 @@
"password": "= secret :couch_soledad_password",
"salt": "= hex_secret :couch_soledad_password_salt, 128"
},
- "tapicero": {
- "username": "tapicero",
- "password": "= secret :couch_tapicero_password",
- "salt": "= hex_secret :couch_tapicero_password_salt, 128"
- },
"webapp": {
"username": "webapp",
"password": "= secret :couch_webapp_password",
diff --git a/puppet/modules/site_config/manifests/remove/tapicero.pp b/puppet/modules/site_config/manifests/remove/tapicero.pp
index 765f7428..497cf8b2 100644
--- a/puppet/modules/site_config/manifests/remove/tapicero.pp
+++ b/puppet/modules/site_config/manifests/remove/tapicero.pp
@@ -32,12 +32,14 @@ class site_config::remove::tapicero {
recurse => true,
matches => 'tapicero*',
require => [ Exec['kill_tapicero'] ];
- '/etc/check_mk/logwatch.d/tapicero.cfg':;
+ '/etc/check_mk/logwatch.d/tapicero.cfg':
+ notify => Exec['check_mk-refresh'];
'checkmk_logwatch_spool':
path => '/var/lib/check_mk/logwatch',
recurse => true,
matches => '*tapicero.log',
- require => [ Exec['kill_tapicero'] ];
+ require => Exec['kill_tapicero'],
+ notify => Exec['check_mk-refresh'];
}
# remove local nagios plugin checks via mrpe
@@ -46,12 +48,14 @@ class site_config::remove::tapicero {
incl => '/etc/check_mk/mrpe.cfg',
lens => 'Spacevars.lns',
changes => 'rm /files/etc/check_mk/mrpe.cfg/Tapicero_Procs',
- require => File['/etc/check_mk/mrpe.cfg'];
+ require => File['/etc/check_mk/mrpe.cfg'],
+ notify => Exec['check_mk-refresh'];
'Tapicero_Heartbeat':
incl => '/etc/check_mk/mrpe.cfg',
lens => 'Spacevars.lns',
changes => 'rm Tapicero_Heartbeat',
- require => File['/etc/check_mk/mrpe.cfg'];
+ require => File['/etc/check_mk/mrpe.cfg'],
+ notify => Exec['check_mk-refresh'];
}
}
diff --git a/tests/white-box/couchdb.rb b/tests/white-box/couchdb.rb
index 5ee12ff3..edb28eac 100644
--- a/tests/white-box/couchdb.rb
+++ b/tests/white-box/couchdb.rb
@@ -9,7 +9,6 @@ class CouchDB < LeapTest
end
def test_00_Are_daemons_running?
- assert_running '^tapicero', :single => true
if multimaster?
assert_running 'bin/beam'
assert_running 'bin/epmd'
@@ -70,7 +69,7 @@ class CouchDB < LeapTest
end
def test_04_Do_ACL_users_exist?
- acl_users = ['_design/_auth', 'leap_mx', 'nickserver', 'soledad', 'tapicero', 'webapp', 'replication']
+ acl_users = ['_design/_auth', 'leap_mx', 'nickserver', 'soledad', 'webapp', 'replication']
url = couchdb_backend_url("/_users/_all_docs", :username => 'admin')
assert_get(url) do |body|
response = JSON.parse(body)
diff --git a/tests/white-box/webapp.rb b/tests/white-box/webapp.rb
index 9956eb35..8be6bde2 100644
--- a/tests/white-box/webapp.rb
+++ b/tests/white-box/webapp.rb
@@ -95,7 +95,7 @@ class Webapp < LeapTest
end
#
- # returns true if the per-user db created by tapicero exists.
+ # returns true if the per-user db created by soledad-server exists.
# we try three times, and give up after that.
#
def assert_user_db_exists(user)