From dc74f17f4fc04ff0da9a0c73a27c919de15c495c Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 6 Jan 2025 10:28:45 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/etc/ rootfs/usr/local/etc/docker/init.d/php.sh rootfs/usr/local/share/template-files/config/tor/torrc --- Dockerfile | 1 - rootfs/{usr/local/share/template-files/config => etc}/tor/torrc | 2 +- rootfs/usr/local/etc/docker/init.d/php.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) rename rootfs/{usr/local/share/template-files/config => etc}/tor/torrc (97%) diff --git a/Dockerfile b/Dockerfile index 26ef3a7..e421477 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -# syntax=docker/dockerfile:1 # Docker image for tor using the alpine template ARG IMAGE_NAME="tor" ARG PHP_SERVER="tor" diff --git a/rootfs/usr/local/share/template-files/config/tor/torrc b/rootfs/etc/tor/torrc similarity index 97% rename from rootfs/usr/local/share/template-files/config/tor/torrc rename to rootfs/etc/tor/torrc index ba6430a..e8194fc 100644 --- a/rootfs/usr/local/share/template-files/config/tor/torrc +++ b/rootfs/etc/tor/torrc @@ -6,7 +6,7 @@ CookieAuthFileGroupReadable 1 HashedControlPassword 16:C30604D1D90F341360A14D9A1048C1DF4A3CA2411444E52EE5B954C01F ##### directiories and files -DataDirectory /data/tordd +DataDirectory /data/tor ControlSocket /run/tor/control.sock CookieAuthFile /run/tor/control.authcookie ##### logging diff --git a/rootfs/usr/local/etc/docker/init.d/php.sh b/rootfs/usr/local/etc/docker/init.d/php.sh index 4192efd..5ae8d74 100755 --- a/rootfs/usr/local/etc/docker/init.d/php.sh +++ b/rootfs/usr/local/etc/docker/init.d/php.sh @@ -59,7 +59,7 @@ printf '%s\n' "# - - - Initializing $SERVICE_NAME - - - #" START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Reset environment before executing service -RESET_ENV="no" +RESET_ENV="yes" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot WWW_ROOT_DIR="/data/htdocs/www"