diff options
Diffstat (limited to 'mason')
| -rwxr-xr-x | mason/mason-report.sh | 6 | ||||
| -rw-r--r-- | mason/mason.service | 2 | ||||
| -rwxr-xr-x | mason/mason.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mason/mason-report.sh b/mason/mason-report.sh index 23182cc9..9c20b65b 100755 --- a/mason/mason-report.sh +++ b/mason/mason-report.sh @@ -2,9 +2,9 @@ set -x -. /root/mason.conf +. /etc/mason.conf -REPORT_PATH=/root/report.html +REPORT_PATH=/var/mason/report.html SERVER_PATH=/srv/mason sed_escape() { @@ -210,7 +210,7 @@ update_report_time "$START_TIME" cp "$REPORT_PATH" "$SERVER_PATH/index.html" logfile="$(mktemp)" -/root/mason.sh 2>&1 | tee "$logfile" +/usr/lib/mason/mason.sh 2>&1 | tee "$logfile" case "${PIPESTATUS[0]}" in 0) RESULT=pass diff --git a/mason/mason.service b/mason/mason.service index 16b5dc3f..ab2338c5 100644 --- a/mason/mason.service +++ b/mason/mason.service @@ -3,7 +3,7 @@ Description=Mason: Continuous Delivery Service [Service] User=root -ExecStart=/root/mason-report.sh +ExecStart=/usr/lib/mason/mason-report.sh [Install] WantedBy=multi-user.target diff --git a/mason/mason.sh b/mason/mason.sh index 13ea21db..32aab032 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -4,7 +4,7 @@ set -e set -x # Load our deployment config -. /root/mason.conf +. /etc/mason.conf if [ ! -e ws ]; then morph init ws |