- Update to deluge 2.1.1 + Patch web base filename,

- Add P2P_WEB_PREFIX env variable support,
- Move back web port to standard 8112,
- Disable WebUi plugin and start Web daemon.
This commit is contained in:
Arnaud G. GIBERT 2025-05-26 23:18:22 +02:00
parent ec778aefad
commit c353ecec79
7 changed files with 31 additions and 17 deletions

View File

@ -62,16 +62,25 @@ user=deluge
environment=HOME='${DELUGE_HOME}
#-----------------------------------------------------------------------------------------------------------------------
#-----------------------------------------------------------------------------------------------------------------------
ARG DELUGE_WEB_INI='[program:deluge_web] \n\
directory='${DELUGE_HOME}' \n\
command=/bin/bash -c `deluge-web --config '${DELUGE_CONFIG}' --base ${DELUGE_WEB_PREFIX} --do-not-daemonize` \n\
user=deluge \n\
environment=HOME='${DELUGE_HOME}
#-----------------------------------------------------------------------------------------------------------------------
RUN urpmi.update -a \
&& urpmi --force deluge myip --no-recommends \
&& useradd --home-dir ${DELUGE_HOME} --password "" deluge \
&& mkdir ${DELUGE_SPOOL} \
&& echo -e "${DELUGED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/deluged \
&& echo -e "${DELUGED}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/init.d/deluged \
&& chmod a+x /etc/init.d/deluged \
&& ln -s /etc/init.d/deluged /etc/rcD.d/S30deluged \
&& echo -e "${DELUGED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluged.ini
&& echo -e "${DELUGED_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluged.ini \
&& echo -e "${DELUGE_WEB_INI}" | sed -e "s/\`/'/g" -e 's/ *$//' > /etc/supervisord.d/deluge_web.ini
ADD ${MODULE_PATH} ${DELUGE_CONFIG_TEMPLATE}

View File

@ -1,3 +1,14 @@
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.1.1 - A. GIBERT - 2025/05/26
------------------------------------------------------------------------------------------------------------------------------------
- Update to deluge 2.1.1 + Patch web base filename,
- Add P2P_WEB_PREFIX env variable support,
- Move back web port to standard 8112,
- Disable WebUi plugin and start Web daemon.
------------------------------------------------------------------------------------------------------------------------------------
Rx3-Docker/Deluge V 1.1.0 - A. GIBERT - 2025/05/25
------------------------------------------------------------------------------------------------------------------------------------

View File

@ -34,6 +34,7 @@ services:
DELUGE_GID: ${P2P_GROUP_ID}
DELUGE_PORT_BT_LOW: ${P2P_PORT_BT_LOW}
DELUGE_PORT_BT_HIGH: ${P2P_PORT_BT_HIGH}
DELUGE_WEB_PREFIX: ${P2P_WEB_PREFIX}
# healthcheck:
# test: /opt/appl/kafka/bin/kafka-cluster.sh cluster-id --bootstrap-server localhost:${P2P_PORT_MAIN_INT}

View File

@ -21,7 +21,7 @@ APPL_NAME="deluge"
APPL_NAME_FULL="Deluge"
APPL_NAME_SHORT="deluge"
APPL_ORG="rx3"
APPL_VERSION="1.1.0"
APPL_VERSION="1.1.1"
APPL_MAINTAINER='"Arnaud G. GIBERT" <arnaud@rx3.net>'
APPL_URL_PREFIX="${ORG_REGISTRY}/${APPL_ORG}"
@ -76,7 +76,7 @@ DOCKER_TOOLS_VOLUME=SINGLE
# | Prefix | Name | URL Prefix | Name | Name Full | Version | URL Prefix | Name | Version | Name | Version | Ext | Int | Ext | Int | Name / Id | Name / Id |
#------------------+----------+--------------------------+--------------------+------------------+-------------------------------+----------------------+--------------------+---------------+------------+--------------+------------+--------------+-------+---------------+-------+--------------+--------------+
docker_service_add P2P peer2peer ${ORG_URL_PREFIX} deluge "Rx3-Docker/Deluge" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 80 ${APPL_USER} ${APPL_GROUP}
docker_service_add P2P peer2peer ${ORG_URL_PREFIX} deluge "Rx3-Docker/Deluge" ${APPL_VERSION}-mga9 ${ORG_URL_PREFIX} server 1.2.2-mga9 - - ${PORT_MAIN} 58846 ${PORT_ADMIN} 8112 ${APPL_USER} ${APPL_GROUP}
@ -95,6 +95,8 @@ P2P_SPOOL_EXT=".${P2P_SPOOL_INT}"
P2P_PORT_BT_LOW=3400
P2P_PORT_BT_HIGH=3415
P2P_WEB_PREFIX="/"
NETWORK_SUBNET=10.10.33.8/30
NETWORK_ADDRESS=10.10.33.9
NETWORK_GATEWAY=10.10.33.10

View File

@ -19,8 +19,7 @@
"AutoAdd",
"Label",
"Stats",
"TotalTraffic",
"WebUi"
"TotalTraffic"
],
"enc_in_policy": 1,
"enc_level": 2,

View File

@ -11,9 +11,9 @@
"interface": "0.0.0.0",
"language": "",
"pkey": "ssl/daemon.pkey",
"port": 80,
"pwd_salt": "682e25a24cbb391ef5f19092841e5beab388e714",
"pwd_sha1": "8b555cafbc04a092446b4d434bede2158925f57d",
"port": 8112,
"pwd_salt": "9dc38672f73e72d2f8c7c90cb87ae3eef624e1e7",
"pwd_sha1": "7a06f92f8e040d443851fc885d49d25b04650de7",
"session_timeout": 3600,
"sessions": {},
"show_session_speed": false,

View File

@ -1,8 +0,0 @@
{
"file": 1,
"format": 1
}{
"enabled": true,
"port": 80,
"ssl": false
}