From 34872e2636ed058a414ee7c66634accb754e8840 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Mon, 1 Sep 2014 18:40:41 +0000
Subject: Move Mason out from /root

- Move the configuration file to /etc/mason.conf
- Move the scripts to /usr/lib/mason/
- Mason will store the report in /var/mason/report.html
---
 mason.configure       | 9 ++++++---
 mason/mason-report.sh | 6 +++---
 mason/mason.service   | 2 +-
 mason/mason.sh        | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mason.configure b/mason.configure
index 9ad6f2c7..23ee23c2 100644
--- a/mason.configure
+++ b/mason.configure
@@ -37,8 +37,10 @@ ROOT="$1"
 # Copy Mason files into root filesystem
 ##########################################################################
 
-cp mason/mason.sh "$ROOT"/root/mason.sh
-cp mason/mason-report.sh "$ROOT"/root/mason-report.sh
+
+mkdir -p "$ROOT"/usr/lib/mason
+cp mason/mason.sh "$ROOT"/usr/lib/mason/mason.sh
+cp mason/mason-report.sh "$ROOT"/usr/lib/mason/mason-report.sh
 
 cp mason/mason.timer "$ROOT"/etc/systemd/system/mason.timer
 
@@ -56,6 +58,7 @@ cat >>"$ROOT"/etc/httpd.conf <<EOF
 .log:text/plain
 EOF
 
+mkdir -p "$ROOT"/var/mason
 
 ##########################################################################
 # Check variables
@@ -89,7 +92,7 @@ shellescape() {
 # Generate config variable shell snippet
 ##########################################################################
 
-MASON_CONFIG="$ROOT"/root/mason.conf
+MASON_CONFIG="$ROOT"/etc/mason.conf
 
 echo "Creating $MASON_CONFIG"
 cat >>"$MASON_CONFIG" <<EOF
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
-- 
cgit v1.2.1