Added separate folders for deluge and delugeweb, moved around a bit scripts
This commit is contained in:
@@ -18,7 +18,8 @@ RUN set -ex; \
|
|||||||
echo "Adding user"; \
|
echo "Adding user"; \
|
||||||
groupadd -g 911 abc && \
|
groupadd -g 911 abc && \
|
||||||
useradd -u 911 -g 911 -s /bin/false -m abc && \
|
useradd -u 911 -g 911 -s /bin/false -m abc && \
|
||||||
usermod -G users abc
|
usermod -G users abc && \
|
||||||
|
mkdir -p /config/deluge && mkdir -p /config/delugeweb
|
||||||
|
|
||||||
# Add configuration and scripts
|
# Add configuration and scripts
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
@@ -37,7 +38,9 @@ ENV OPENVPN_USERNAME=**None** \
|
|||||||
LANG='en_US.UTF-8' \
|
LANG='en_US.UTF-8' \
|
||||||
LANGUAGE='en_US.UTF-8' \
|
LANGUAGE='en_US.UTF-8' \
|
||||||
TERM='xterm' \
|
TERM='xterm' \
|
||||||
LOCAL_NETWORK=
|
LOCAL_NETWORK= \
|
||||||
|
PEER_DNS= \
|
||||||
|
DISABLE_PORT_UPDATER=
|
||||||
|
|
||||||
HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
|
HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
|
||||||
|
|
||||||
@@ -46,4 +49,4 @@ VOLUME /config
|
|||||||
|
|
||||||
EXPOSE 8112 58846 58946 58946/udp
|
EXPOSE 8112 58846 58946 58946/udp
|
||||||
|
|
||||||
CMD ["dumb-init", "/etc/openvpn/start.sh"]
|
CMD ["dumb-init", "/etc/openvpn/init.sh"]
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
||||||
log() {
|
log() {
|
||||||
echo "$(date +"${TIMESTAMP_FORMAT}") [tunnel-up] $*"
|
echo "$(date +"${TIMESTAMP_FORMAT}") [deluge-start] $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Source our persisted env variables from container startup
|
# Source our persisted env variables from container startup
|
||||||
@@ -72,7 +72,7 @@ fi
|
|||||||
ufw status
|
ufw status
|
||||||
|
|
||||||
log "Starting Deluge"
|
log "Starting Deluge"
|
||||||
exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluged -d -c /config -L info -l /config/deluged.log" &
|
exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluged -d -c /config/deluge -L info -l /config/deluge/deluged.log" &
|
||||||
|
|
||||||
# wait for deluge daemon process to start (listen for port)
|
# wait for deluge daemon process to start (listen for port)
|
||||||
while [[ $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".58846"') == "" ]]; do
|
while [[ $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".58846"') == "" ]]; do
|
||||||
@@ -80,7 +80,7 @@ while [[ $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".58846"') == "" ]]; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
log "Starting Deluge webui..."
|
log "Starting Deluge webui..."
|
||||||
exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluge-web -d -c /config -L info -l /config/web.log" &
|
exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluge-web -d -c /config/delugeweb -L info -l /config/delugeweb/web.log" &
|
||||||
|
|
||||||
# Configure port forwarding if applicable
|
# Configure port forwarding if applicable
|
||||||
if [[ -x /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh && -z $DISABLE_PORT_UPDATER ]]; then
|
if [[ -x /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh && -z $DISABLE_PORT_UPDATER ]]; then
|
||||||
|
@@ -2,18 +2,18 @@
|
|||||||
|
|
||||||
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
||||||
log() {
|
log() {
|
||||||
echo "$(date +"${TIMESTAMP_FORMAT}") [tunnel-down] $*"
|
echo "$(date +"${TIMESTAMP_FORMAT}") [deluge-stop] $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
# If deluge-pre-stop.sh exists, run it
|
# If deluge-pre-stop.sh exists, run it
|
||||||
if [[ -x /config/deluge-pre-stop.sh ]]
|
if [[ -x /config/deluge-pre-stop.sh ]]
|
||||||
then
|
then
|
||||||
echo "Executing /config/deluge-pre-stop.sh"
|
log "Executing /config/deluge-pre-stop.sh"
|
||||||
/config/deluge-pre-stop.sh "$@"
|
/config/deluge-pre-stop.sh "$@"
|
||||||
echo "/config/deluge-pre-stop.sh returned $?"
|
log "/config/deluge-pre-stop.sh returned $?"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Sending kill signal to deluge-daemon"
|
log "Sending kill signal to deluge-daemon"
|
||||||
PID=$(pidof deluged)
|
PID=$(pidof deluged)
|
||||||
kill -9 $PID
|
kill -9 $PID
|
||||||
# Give deluge-daemon time to shut down
|
# Give deluge-daemon time to shut down
|
||||||
@@ -25,7 +25,7 @@ done
|
|||||||
# If deluge-post-stop.sh exists, run it
|
# If deluge-post-stop.sh exists, run it
|
||||||
if [[ -x /config/deluge-post-stop.sh ]]
|
if [[ -x /config/deluge-post-stop.sh ]]
|
||||||
then
|
then
|
||||||
echo "Executing /config/deluge-post-stop.sh"
|
log "Executing /config/deluge-post-stop.sh"
|
||||||
/config/deluge-post-stop.sh "$@"
|
/config/deluge-post-stop.sh "$@"
|
||||||
echo "/config/deluge-post-stop.sh returned $?"
|
log "/config/deluge-post-stop.sh returned $?"
|
||||||
fi
|
fi
|
||||||
|
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
||||||
log() {
|
log() {
|
||||||
echo "$(date +"${TIMESTAMP_FORMAT}") [tunnel-up] $*"
|
echo "$(date +"${TIMESTAMP_FORMAT}") [start-vpn] $*"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ -n "$REVISION" ]]; then
|
if [[ -n "$REVISION" ]]; then
|
||||||
@@ -73,7 +73,7 @@ chmod -R 775 /usr/bin/deluged /usr/bin/deluge-web
|
|||||||
# if config file doesnt exist (wont exist until user changes a setting) then copy default config file
|
# if config file doesnt exist (wont exist until user changes a setting) then copy default config file
|
||||||
if [[ ! -f /config/core.conf ]]; then
|
if [[ ! -f /config/core.conf ]]; then
|
||||||
log "[info] Deluge config file doesn't exist, copying default..."
|
log "[info] Deluge config file doesn't exist, copying default..."
|
||||||
cp /etc/config/core.conf /config/
|
cp /etc/config/core.conf /config/deluge/
|
||||||
else
|
else
|
||||||
log "[info] Deluge config file already exists, skipping copy"
|
log "[info] Deluge config file already exists, skipping copy"
|
||||||
fi
|
fi
|
||||||
@@ -81,7 +81,7 @@ fi
|
|||||||
# if config file doesnt exist then copy stock config file
|
# if config file doesnt exist then copy stock config file
|
||||||
if [[ ! -f /config/web.conf ]]; then
|
if [[ ! -f /config/web.conf ]]; then
|
||||||
log "[info] Deluge webui config file doesn't exist, copying default..."
|
log "[info] Deluge webui config file doesn't exist, copying default..."
|
||||||
cp /etc/config/web.conf /config/
|
cp /etc/config/web.conf /config/deluge-web/
|
||||||
else
|
else
|
||||||
log "[info] Deluge webui config file already exists, skipping copy"
|
log "[info] Deluge webui config file already exists, skipping copy"
|
||||||
fi
|
fi
|
14
root/etc/ufw/disable.sh
Normal file
14
root/etc/ufw/disable.sh
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
||||||
|
log() {
|
||||||
|
echo "$(date +"${TIMESTAMP_FORMAT}") [ufw-disable] $*"
|
||||||
|
}
|
||||||
|
# Source our persisted env variables from container startup
|
||||||
|
. /etc/deluge/environment-variables.sh
|
||||||
|
|
||||||
|
ufw reset
|
||||||
|
ufw disable
|
||||||
|
ufw status
|
@@ -4,7 +4,7 @@ set -e
|
|||||||
|
|
||||||
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
TIMESTAMP_FORMAT='%a %b %d %T %Y'
|
||||||
log() {
|
log() {
|
||||||
echo "$(date +"${TIMESTAMP_FORMAT}") [tunnel-up] $*"
|
echo "$(date +"${TIMESTAMP_FORMAT}") [ufw-enable] $*"
|
||||||
}
|
}
|
||||||
# Source our persisted env variables from container startup
|
# Source our persisted env variables from container startup
|
||||||
. /etc/deluge/environment-variables.sh
|
. /etc/deluge/environment-variables.sh
|
||||||
|
Reference in New Issue
Block a user