From 7dbfe8533ca04675d78b5c9df5a1475c85643c25 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 13 Sep 2018 19:27:23 +0200 Subject: [PATCH] LXCize CTS setup --- cts/setup.sh | 33 ++++++++++++++++++--------------- cts/setup/etc/init.d/cts | 13 ++++--------- setup-all.sh | 4 ++-- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/cts/setup.sh b/cts/setup.sh index f319016..7b514cf 100755 --- a/cts/setup.sh +++ b/cts/setup.sh @@ -1,24 +1,21 @@ #!/bin/sh set -e -SOURCE_DIR=$(realpath $(dirname "${0}"))/cts +SOURCE_DIR=$(realpath $(dirname "${0}"))/setup # Check prerequisites -lxc-ls | grep -q postgres || $(realpath $(dirname "${0}"))/postgres.sh -service postgres start - -# Build Docker container -docker build -t cts ${SOURCE_DIR} -cp ${SOURCE_DIR}/etc/init.d/cts /etc/init.d/cts -rc-update -u +# TODO: Have setup prereqs in a manifest file +for SERVICE in postgres; do + [ ! -e /run/openrc/started/${SERVICE} ] && service ${SERVICE} start && STOP_SERVICES="${STOP_SERVICES} ${SERVICE}" +done # Create database export CTS_PWD=$(head -c 18 /dev/urandom | base64) -envsubst <${SOURCE_DIR}/createdb.sql | docker exec -i postgres psql +envsubst <${SOURCE_DIR}/createdb.sql | lxc-attach -u 5432 -g 5432 postgres -- psql # Copy existing config files into persistent storage mkdir -p /srv/cts/conf -docker run --rm -v /srv/cts/conf:/mnt/conf cts cp /srv/cts/cts/settings/base.py /mnt/conf/ +cp /var/lib/lxc/cts/cts/srv/cts/cts/settings/base.py /srv/cts/conf # Configure CTS export CTS_SECRET=$(head -c 26 /dev/urandom | base64) @@ -31,15 +28,21 @@ if [ ${DEBUG:-0} -eq 0 ]; then fi # Populate database -docker run --rm -h cts --link postgres -v /srv/cts/conf:/srv/cts/cts/settings cts manage.py migrate +lxc-execute cts -- manage.py migrate # Create admin account export CTS_ADMIN_EMAIL=admin@example.com export CTS_ADMIN_PWD=$(head -c 12 /dev/urandom | base64) -export CTS_ADMIN_HASH=$(docker run --rm -h cts -v /srv/cts/conf:/srv/cts/cts/settings cts python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')") +export CTS_ADMIN_HASH=$(lxc-execute cts -- python -c "from django.contrib.auth.hashers import make_password; print make_password('${CTS_ADMIN_PWD}')") export CTS_ADMIN_SECRET=$(head -c 12 /dev/urandom | sha256sum | cut -c1-13) -envsubst <${SOURCE_DIR}/adminpwd.sql | docker exec -i postgres psql cts +envsubst <${SOURCE_DIR}/adminpwd.sql | lxc-attach -u 5432 -g 5432 postgres -- psql cts vmmgr update-login cts "${CTS_ADMIN_EMAIL}" "${CTS_ADMIN_PWD}" -# Stop services required for build -service postgres stop +# Install service +cp ${SOURCE_DIR}/etc/init.d/cts /etc/init.d/cts +rc-update -u + +# Stop services required for setup +for SERVICE in ${STOP_SERVICES}; do + service ${SERVICE} stop +done diff --git a/cts/setup/etc/init.d/cts b/cts/setup/etc/init.d/cts index af4c2cb..9934fa6 100755 --- a/cts/setup/etc/init.d/cts +++ b/cts/setup/etc/init.d/cts @@ -1,18 +1,13 @@ #!/sbin/openrc-run -description="CTS docker container" +description="CTS container" depend() { - need docker postgres + need cgroups postgres } start() { - /usr/bin/docker run -d --rm \ - --name cts \ - -h cts \ - --link postgres \ - -v /srv/cts/conf:/srv/cts/cts/settings \ - cts + lxc-start cts } start_post() { @@ -24,5 +19,5 @@ stop_pre() { } stop() { - /usr/bin/docker stop cts + lxc-stop cts } diff --git a/setup-all.sh b/setup-all.sh index 9e75815..0064dea 100755 --- a/setup-all.sh +++ b/setup-all.sh @@ -14,8 +14,8 @@ ${SOURCE_DIR}/solr/setup.sh # Setup applications ${SOURCE_DIR}/ckan/setup.sh -#${SOURCE_DIR}/crisiscleanup/setup.sh -#${SOURCE_DIR}/cts/setup.sh +${SOURCE_DIR}/crisiscleanup/setup.sh +${SOURCE_DIR}/cts/setup.sh #${SOURCE_DIR}/frontlinesms/setup.sh #${SOURCE_DIR}/gnuhealth/setup.sh #${SOURCE_DIR}/kanboard/setup.sh