Commit 9aa036d0 authored by Paul Cammish's avatar Paul Cammish
Browse files

Fix paths for tests.

parent b4e30542
......@@ -19,9 +19,9 @@
set -e
echo -n "I: Checking /etc/roundcube/config.inc.php.dpkg-symbiosis-orig is not a symlink..."
echo -n "I: Checking /etc/roundcube/config.inc.php.dpkg-sympl-orig is not a symlink..."
if [ -h /etc/roundcube/config.inc.php.dpkg-symbiosis-orig ]; then
if [ -h /etc/roundcube/config.inc.php.dpkg-sympl-orig ]; then
echo " It is a symbolic link, when it should be a file. FAILING!"
exit 1
else
......
......@@ -3,11 +3,11 @@
# Check all the services are up and running as expected before continuing.
# If it's disabled for some reason, re-enable monit (so the test count is right).
if [ -f '/etc/symbiosis/monit.d/disabled' ]; then
rm '/etc/symbiosis/monit.d/disabled'
if [ -f '/etc/sympl/monit.d/disabled' ]; then
rm '/etc/sympl/monit.d/disabled'
fi
echo -n "I: Waiting for all $( find /etc/symbiosis/monit.d -type l | wc -l ) Monit tests to pass."
echo -n "I: Waiting for all $( find /etc/sympl/monit.d -type l | wc -l ) Monit tests to pass."
until symbiosis-monit --force ; do echo -n '.' ; done
echo
#!/bin/bash
# It's unclear why, but the first time this runs, one of the AV tests fails.
echo 'Running symbiosis-test...'
/usr/bin/symbiosis-test > /dev/null 2>&1
echo 'Running sympl-test...'
/usr/bin/sympl-test > /dev/null 2>&1
# ...so, we'll ignore that and run it again.
/usr/bin/symbiosis-test
/usr/bin/sympl-test
......@@ -23,7 +23,7 @@ ERRORCOUNT=0
declare -r MYSQL_USER="sympl"
declare -r MYSQL_PASS="$(head -n 1 /home/sympl/mysql_password)"
declare -r MYSQL_DATABASE="sympl_test_database_$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)"
declare -r MYSQL_DUMP_SCRIPT="/etc/symbiosis/backup.d/pre-backup.d/20-sympl-sqldump --config /dev/shm/sympl-sqldump.conf --force"
declare -r MYSQL_DUMP_SCRIPT="/etc/sympl/backup.d/pre-backup.d/20-sympl-sqldump --config /dev/shm/sympl-sqldump.conf --force"
declare -r MYSQL_DUMP_PATH="/var/backups/mysql"
declare -r MYSQL_DUMP_FILE="--${MYSQL_DATABASE}--"
declare -r MYSQL_ENCODINGS="UTF8 LATIN1"
......
......@@ -9,7 +9,7 @@ module Symbiosis
# Hooks for SSL
class Hooks < Symbiosis::Hooks
HOOKS_DIR = File.join('symbiosis', 'ssl-hooks.d').freeze
HOOKS_DIR = File.join('sympl', 'ssl-hooks.d').freeze
def self.run!(event, domains)
Symbiosis::SSL::Hooks.new.run! event, domains
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment