From bd80090e5e1b076f2635ec90cac57ec450fbd1ec Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 13 May 2025 19:07:31 -0400 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 rootfs/usr/local/etc/docker/init.d/00-aria2c.sh --- .../usr/local/etc/docker/init.d/00-aria2c.sh | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/00-aria2c.sh b/rootfs/usr/local/etc/docker/init.d/00-aria2c.sh index 74e1fd9..21e6979 100755 --- a/rootfs/usr/local/etc/docker/init.d/00-aria2c.sh +++ b/rootfs/usr/local/etc/docker/init.d/00-aria2c.sh @@ -241,21 +241,21 @@ __update_conf_files() { # replace variables __replace "REPLACE_RPC_PORT" "$rpc_port" "$CONF_DIR/aria2.conf" __replace "REPLACE_SERVER_ADDR" "$CONTAINER_IP4_ADDRESS" "$CONF_DIR/aria-ng.config.js" - if [ -n "$RPC_SECRET" ]; then - echo "Changing rpc secret to $RPC_SECRET" - secret_secret_rpc_base64="$(echo -n "$RPC_SECRET" | base64 -w 0)" - if grep -sq "rpc-secret=" "$CONF_DIR/aria2.conf"; then - __replace "#rpc-secret=" "rpc-secret=" "$CONF_DIR/aria2.conf" - __replace "REPLACE_RPC_SECRET" "$RPC_SECRET" "$CONF_DIR/aria2.conf" - echo "$secret_rpc_base64 >$CONF_DIR/aria-ng.config.js" - __replace "REPLACE_RPC_SECRET" "$secret_rpc_base64" "$CONF_DIR/aria-ng.config.js" - else - echo "rpc-secret=$RPC_SECRET" >>"$CONF_DIR/aria2.conf" - fi - else - __replace "rpc-secret=" "#rpc-secret=" "$CONF_DIR/aria2.conf" - __replace "REPLACE_RPC_SECRET" "" "$CONF_DIR/aria-ng.config.js" - fi + # if [ -n "$RPC_SECRET" ]; then + # echo "Changing rpc secret to $RPC_SECRET" + # secret_secret_rpc_base64="$(echo -n "$RPC_SECRET" | base64 -w 0)" + # if grep -sq "rpc-secret=" "$CONF_DIR/aria2.conf"; then + # __replace "#rpc-secret=" "rpc-secret=" "$CONF_DIR/aria2.conf" + # __replace "REPLACE_RPC_SECRET" "$RPC_SECRET" "$CONF_DIR/aria2.conf" + # echo "Setting $secret_rpc_base64 in $CONF_DIR/aria-ng.config.js" + # __replace "REPLACE_RPC_SECRET" "$secret_rpc_base64" "$CONF_DIR/aria-ng.config.js" + # else + # echo "rpc-secret=$RPC_SECRET" >>"$CONF_DIR/aria2.conf" + # fi + # else + __replace "rpc-secret=" "#rpc-secret=" "$CONF_DIR/aria2.conf" + __replace "REPLACE_RPC_SECRET" "" "$CONF_DIR/aria-ng.config.js" + # fi if [ -n "$dht_port" ]; then sed -i "s@^\(listen-port=\).*@\1$dht_port@" "$CONF_DIR/aria2.conf" sed -i "s@^\(dht-listen-port=\).*@\1$dht_port@" "$CONF_DIR/aria2.conf"