aboutsummaryrefslogtreecommitdiff
path: root/guix-container.sh
diff options
context:
space:
mode:
authorWojtek Kosior <koszko@koszko.org>2022-11-23 11:21:33 +0100
committerWojtek Kosior <koszko@koszko.org>2022-11-23 11:21:33 +0100
commit0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5 (patch)
tree6967ec83989e35c075dd9bbbc4fe088f317a2da4 /guix-container.sh
parentb3e66d97993318e91c0ff634fec62978f6530785 (diff)
downloadkoszko-org-server-0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5.tar.gz
koszko-org-server-0ef35f69a5c5aa12d45c855ce6ea66f07efa99d5.zip
add haketilo.koszko.org virtualhost
Diffstat (limited to 'guix-container.sh')
-rwxr-xr-xguix-container.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/guix-container.sh b/guix-container.sh
index f844b5d..064d4c9 100755
--- a/guix-container.sh
+++ b/guix-container.sh
@@ -26,20 +26,22 @@ fi
PIDFILE=/run/guix-container.pid
EXECUTABLE=/usr/local/bin/guix-container
-LOG_DIR=/var/log/guix-container
WWW_DIR=/var/www
+LOG_DIR=/var/log/guix-container
+ETC_DIR=/etc/guix-container
MAX_CONTAINER_SPINUP_WAIT=60
ACTION="$1"
shift
OPTIND=1
-while getopts p:e:l:w:s: OPTION_LETTER ; do
+while getopts p:e:w:l:t:s: OPTION_LETTER ; do
case "$OPTION_LETTER" in
p) PIDFILE="$OPTARG" ;;
e) EXECUTABLE="$OPTARG" ;;
- l) LOG_DIR="$OPTARG" ;;
w) WWW_DIR="$OPTARG" ;;
+ l) LOG_DIR="$OPTARG" ;;
+ t) ETC_DIR="$OPTARG" ;;
s) MAX_CONTAINER_SPINUP_WAIT="$OPTARG" ;;
esac
done
@@ -83,14 +85,18 @@ onexit() {
start() {
KOSZKO_SIDELOAD_REAL="$WWW_DIR"/koszko.org/html
LOG_REAL="$LOG_DIR"/container
+ ETC_REAL="$ETC_DIR"
HTTP_DIR_SHARE_OPT=--share="$KOSZKO_SIDELOAD_REAL"=/srv/http/koszko.org
LOG_DIR_SHARE_OPT=--share="$LOG_REAL"=/var/log
+ ETC_DIR_SHARE_OPT=--share="$ETC_REAL"=/etc
mkdir --mode=700 -p "$LOG_DIR"
mkdir --mode=700 -p "$LOG_DIR"/container
- "$EXECUTABLE" "$HTTP_DIR_SHARE_OPT" "$LOG_DIR_SHARE_OPT" \
+ "$EXECUTABLE" "$HTTP_DIR_SHARE_OPT" \
+ "$LOG_DIR_SHARE_OPT" \
+ "$ETC_DIR_SHARE_OPT" \
>> "$LOG_DIR"/stdout.log 2>> "$LOG_DIR"/stderr.log &
GUILE_PID=$!