Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Ian Eiloart
Sympl
Commits
9aa036d0
Commit
9aa036d0
authored
Jun 19, 2019
by
Paul Cammish
Browse files
Fix paths for tests.
parent
b4e30542
Changes
5
Hide whitespace changes
Inline
Side-by-side
autotest/test.d/10-check-roundcube-config
View file @
9aa036d0
...
...
@@ -19,9 +19,9 @@
set
-e
echo
-n
"I: Checking /etc/roundcube/config.inc.php.dpkg-sym
biosis
-orig is not a symlink..."
echo
-n
"I: Checking /etc/roundcube/config.inc.php.dpkg-sym
pl
-orig is not a symlink..."
if
[
-h
/etc/roundcube/config.inc.php.dpkg-sym
biosis
-orig
]
;
then
if
[
-h
/etc/roundcube/config.inc.php.dpkg-sym
pl
-orig
]
;
then
echo
" It is a symbolic link, when it should be a file. FAILING!"
exit
1
else
...
...
autotest/test.d/80-monit
View file @
9aa036d0
...
...
@@ -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/sym
biosis
/monit.d/disabled'
]
;
then
rm
'/etc/sym
biosis
/monit.d/disabled'
if
[
-f
'/etc/sym
pl
/monit.d/disabled'
]
;
then
rm
'/etc/sym
pl
/monit.d/disabled'
fi
echo
-n
"I: Waiting for all
$(
find /etc/sym
biosis
/monit.d
-type
l |
wc
-l
)
Monit tests to pass."
echo
-n
"I: Waiting for all
$(
find /etc/sym
pl
/monit.d
-type
l |
wc
-l
)
Monit tests to pass."
until
symbiosis-monit
--force
;
do
echo
-n
'.'
;
done
echo
autotest/test.d/90-symbiosis-test
View file @
9aa036d0
#!/bin/bash
# It's unclear why, but the first time this runs, one of the AV tests fails.
echo
'Running sym
biosis
-test...'
/usr/bin/sym
biosis
-test
>
/dev/null 2>&1
echo
'Running sym
pl
-test...'
/usr/bin/sym
pl
-test
>
/dev/null 2>&1
# ...so, we'll ignore that and run it again.
/usr/bin/sym
biosis
-test
/usr/bin/sym
pl
-test
autotest/test.d/99-sympl-sqldump
View file @
9aa036d0
...
...
@@ -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/sym
biosis
/backup.d/pre-backup.d/20-sympl-sqldump --config /dev/shm/sympl-sqldump.conf --force"
declare
-r
MYSQL_DUMP_SCRIPT
=
"/etc/sym
pl
/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"
...
...
core/lib/symbiosis/ssl.rb
View file @
9aa036d0
...
...
@@ -9,7 +9,7 @@ module Symbiosis
# Hooks for SSL
class
Hooks
<
Symbiosis
::
Hooks
HOOKS_DIR
=
File
.
join
(
'sym
biosis
'
,
'ssl-hooks.d'
).
freeze
HOOKS_DIR
=
File
.
join
(
'sym
pl
'
,
'ssl-hooks.d'
).
freeze
def
self
.
run!
(
event
,
domains
)
Symbiosis
::
SSL
::
Hooks
.
new
.
run!
event
,
domains
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment