4 files changed, 4 insertions, 81 deletions
diff --git a/roles/jails/08_diddle/templates/root_diddle_env.j2 b/roles/jails/08_diddle/templates/diddle.env.j2
index ca7db78..9647716 100644
--- a/roles/jails/08_diddle/templates/root_diddle_env.j2
+++ b/roles/jails/08_diddle/templates/diddle.env.j2
@@ -7,3 +7,7 @@ EMAIL_HOST_USER="{{ diddle_email_host_user }}"
 EMAIL_HOST_PASSWORD="{{ diddle_email_host_password }}"
 EMAIL_USE_TLS="true"
 EMAIL_MESSAGE_FROM="diddle@jan.systems"
+
+POLICY_URL="/policy"
+POLICY_INSTANCE_DOMAIN="diddle.jan.systems"
+POLICY_CONTACT_EMAIL="jan (at) jantuomi.fi"
diff --git a/roles/jails/08_diddle/templates/root_clone.sh b/roles/jails/08_diddle/templates/root_clone.sh
deleted file mode 100644
index 7f92c5f..0000000
--- a/roles/jails/08_diddle/templates/root_clone.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-REPO="$1"
-TARGET="$2"
-
-set -eux
-
-# Exits with 100 if the directory was changed
-
-if [ ! -d "$TARGET" ]; then
-    git clone --depth=1 --branch main --single-branch "$REPO" "$TARGET"
-    exit 100
-fi
-
-cd "$TARGET"
-before=$(git rev-parse HEAD)
-git fetch --depth=1 --prune origin main
-git reset --hard origin/main
-after=$(git rev-parse HEAD)
-
-if [ "$before" != "$after" ]; then exit 100; fi
diff --git a/roles/jails/08_diddle/templates/usr_local_bin_diddle b/roles/jails/08_diddle/templates/usr_local_bin_diddle
deleted file mode 100644
index d07cd5e..0000000
--- a/roles/jails/08_diddle/templates/usr_local_bin_diddle
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -eux
-
-PATH=$PATH:/usr/local/bin
-
-cd /root/diddle
-
-if [ ! -f venv ]; then
-    python3.11 -m venv venv
-fi
-
-PATH=$PATH:/root/diddle/venv/bin
-
-pip install -r requirements.txt
-python apply_migrations.py
-gunicorn --bind "0.0.0.0:80" -w 4 app:app
diff --git a/roles/jails/08_diddle/templates/usr_local_etc_rc.d_diddle b/roles/jails/08_diddle/templates/usr_local_etc_rc.d_diddle
deleted file mode 100644
index 09a4712..0000000
--- a/roles/jails/08_diddle/templates/usr_local_etc_rc.d_diddle
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: diddle
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="diddle"
-rcvar="diddle_enable"
-pidfile="/var/run/${name}.pid"
-
-start_cmd="${name}_start"
-stop_cmd="${name}_stop"
-status_cmd="${name}_status"
-
-diddle_start()
-{
-    echo "Starting ${name}..."
-    daemon -p ${pidfile} -o /var/log/diddle.log /usr/local/bin/diddle
-}
-
-diddle_stop()
-{
-    if [ -f ${pidfile} ]; then
-        echo "Stopping ${name}..."
-        kill $(cat ${pidfile}) 2>/dev/null
-        rm -f ${pidfile}
-    fi
-}
-
-diddle_status()
-{
-    if [ -f ${pidfile} ] && kill -0 $(cat ${pidfile}) 2>/dev/null; then
-        echo "${name} is running as pid $(cat ${pidfile})"
-    else
-        echo "${name} is not running"
-        return 1
-    fi
-}
-
-load_rc_config $name
-run_rc_command "$1"