diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-14 15:33:27 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2014-03-14 15:33:27 +0000 |
| commit | 8b705363440198e0cb5a3363246578a2d50cc866 (patch) | |
| tree | 944b6d666ab9485caba1c8a786741776009fb6c8 | |
| parent | 42153950caea9844f55d1973e223eacd0bffdc13 (diff) | |
| download | definitions-8b705363440198e0cb5a3363246578a2d50cc866.tar.gz | |
Move webapp.conf to trove.configure for $TROVEID
| -rw-r--r-- | liw-lc-trove/etc/lorry-controller/webapp.conf | 10 | ||||
| -rw-r--r-- | liw-lc-trove/manifest | 2 | ||||
| -rwxr-xr-x | trove.configure | 16 |
3 files changed, 15 insertions, 13 deletions
diff --git a/liw-lc-trove/etc/lorry-controller/webapp.conf b/liw-lc-trove/etc/lorry-controller/webapp.conf deleted file mode 100644 index 42deaef4..00000000 --- a/liw-lc-trove/etc/lorry-controller/webapp.conf +++ /dev/null @@ -1,10 +0,0 @@ -[config] -log = syslog -log-level = debug -statedb = /home/lorry/webapp.db -configuration-directory = /home/lorry/confgit -status-html = /home/lorry/status.html -wsgi = False -debug-port = 12765 -templates = /usr/share/lorry-controller/templates -static-files = /usr/share/lorry-controller/static diff --git a/liw-lc-trove/manifest b/liw-lc-trove/manifest index 0fbd16bd..2ee386c8 100644 --- a/liw-lc-trove/manifest +++ b/liw-lc-trove/manifest @@ -6,6 +6,4 @@ 0100644 0 0 etc/ssh/ssh_host_key.pub 0100600 0 0 etc/ssh/ssh_host_rsa_key 0100644 0 0 etc/ssh/ssh_host_rsa_key.pub -0040755 0 0 etc/lorry-controller 0100644 0 0 etc/lorry-controller/minion.conf -0100644 0 0 etc/lorry-controller/webapp.conf diff --git a/trove.configure b/trove.configure index 5f2acb0b..8d91ea44 100755 --- a/trove.configure +++ b/trove.configure @@ -147,7 +147,21 @@ fi ########################################################################## echo "Create Lorry Controller config" -echo "confgit-url = $TROVEID" >> "$ROOT/etc/lorry-controller/webapp.conf" +install -d "$ROOT/etc/lorry-controller" +cat <<EOF +[config] +log = syslog +log-level = debug +statedb = /home/lorry/webapp.db +configuration-directory = /home/lorry/confgit +status-html = /home/lorry/status.html +wsgi = False +debug-port = 12765 +templates = /usr/share/lorry-controller/templates +static-files = /usr/share/lorry-controller/static +confgit-url = $TROVEID +EOF + echo "Set up Lorry Controller MINIONs" UNITS="$ROOT/usr/lib/systemd/system" |