From 5b944931a37842afebbbd4498fd808454e926c01 Mon Sep 17 00:00:00 2001 From: Eldwan Brianne Date: Tue, 16 Mar 2021 23:31:51 +0100 Subject: [PATCH] Small fixes, added default nordvpn file --- .gitignore | 3 +- Dockerfile | 3 +- root/etc/deluge/start.sh | 6 +- root/etc/openvpn/init.sh | 6 +- root/etc/openvpn/nordvpn/default.ovpn | 81 +++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 9 deletions(-) create mode 100644 root/etc/openvpn/nordvpn/default.ovpn diff --git a/.gitignore b/.gitignore index a031848e5..c41555334 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .vscode -docker-compose.yml \ No newline at end of file +docker-compose.yml +env \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 345360748..a7a46660d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,7 @@ RUN set -ex; \ echo "Adding user"; \ groupadd -g 911 abc && \ useradd -u 911 -g 911 -s /bin/false -m abc && \ - usermod -G users abc && \ - mkdir -p /config/deluge && mkdir -p /config/delugeweb + usermod -G users abc # Add configuration and scripts COPY root/ / diff --git a/root/etc/deluge/start.sh b/root/etc/deluge/start.sh index 050f56bac..f461d2f0d 100755 --- a/root/etc/deluge/start.sh +++ b/root/etc/deluge/start.sh @@ -53,7 +53,7 @@ if [[ "${ENABLE_UFW,,}" == "true" ]] || [[ -n "${LOCAL_NETWORK-}" ]]; then fi fi -echo "Got local network ${GW} and CIDR ${GW_CIDR} on interface ${INT}" +log "Got local network ${GW} and CIDR ${GW_CIDR} on interface ${INT}" if [[ "${ENABLE_UFW,,}" == "true" && "${UFW_ALLOW_GW_NET,,}" == "true" ]]; then log "Allow from ${GW_CIDR}" @@ -72,7 +72,7 @@ fi ufw status log "Starting Deluge" -exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluged -d -c /config/deluge -L info -l /config/deluge/deluged.log" & +exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluged -d -c /config -L info -l /config/deluged.log" & # wait for deluge daemon process to start (listen for port) while [[ $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".58846"') == "" ]]; do @@ -80,7 +80,7 @@ while [[ $(netstat -lnt | awk '$6 == "LISTEN" && $4 ~ ".58846"') == "" ]]; do done log "Starting Deluge webui..." -exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluge-web -d -c /config/delugeweb -L info -l /config/delugeweb/web.log" & +exec su --preserve-environment abc -s /bin/bash -c "/usr/bin/deluge-web -c /config -L info -l /config/web.log" & # Configure port forwarding if applicable if [[ -x /etc/openvpn/${OPENVPN_PROVIDER,,}/update-port.sh && -z $DISABLE_PORT_UPDATER ]]; then diff --git a/root/etc/openvpn/init.sh b/root/etc/openvpn/init.sh index 423ddf0be..9745aa176 100755 --- a/root/etc/openvpn/init.sh +++ b/root/etc/openvpn/init.sh @@ -61,7 +61,7 @@ if [[ ! -f "/config/perms.txt" ]]; then log "[warn] Unable to chown/chmod ${volumes}, assuming NFS/SMB mountpoint" fi - echo "This file prevents permissions from being applied/re-applied to /config, if you want to reset permissions then please delete this file and restart the container." >/config/perms.txt + log "This file prevents permissions from being applied/re-applied to /config, if you want to reset permissions then please delete this file and restart the container." >/config/perms.txt else log "[info] Permissions already set for volume mappings" fi @@ -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 [[ ! -f /config/core.conf ]]; then log "[info] Deluge config file doesn't exist, copying default..." - cp /etc/config/core.conf /config/deluge/ + cp /etc/config/core.conf /config else log "[info] Deluge config file already exists, skipping copy" fi @@ -81,7 +81,7 @@ fi # if config file doesnt exist then copy stock config file if [[ ! -f /config/web.conf ]]; then log "[info] Deluge webui config file doesn't exist, copying default..." - cp /etc/config/web.conf /config/deluge-web/ + cp /etc/config/web.conf /config else log "[info] Deluge webui config file already exists, skipping copy" fi diff --git a/root/etc/openvpn/nordvpn/default.ovpn b/root/etc/openvpn/nordvpn/default.ovpn new file mode 100644 index 000000000..b599ed161 --- /dev/null +++ b/root/etc/openvpn/nordvpn/default.ovpn @@ -0,0 +1,81 @@ +client +dev tun +proto udp +remote 83.97.23.3 1194 +resolv-retry infinite +remote-random +nobind +tun-mtu 1500 +tun-mtu-extra 32 +mssfix 1450 +persist-key +persist-tun +ping 15 +ping-restart 0 +ping-timer-rem +reneg-sec 0 +comp-lzo no + +remote-cert-tls server + +auth-user-pass +verb 3 +pull +fast-io +cipher AES-256-CBC +auth SHA512 + +-----BEGIN CERTIFICATE----- +MIIFCjCCAvKgAwIBAgIBATANBgkqhkiG9w0BAQ0FADA5MQswCQYDVQQGEwJQQTEQ +MA4GA1UEChMHTm9yZFZQTjEYMBYGA1UEAxMPTm9yZFZQTiBSb290IENBMB4XDTE2 +MDEwMTAwMDAwMFoXDTM1MTIzMTIzNTk1OVowOTELMAkGA1UEBhMCUEExEDAOBgNV +BAoTB05vcmRWUE4xGDAWBgNVBAMTD05vcmRWUE4gUm9vdCBDQTCCAiIwDQYJKoZI +hvcNAQEBBQADggIPADCCAgoCggIBAMkr/BYhyo0F2upsIMXwC6QvkZps3NN2/eQF +kfQIS1gql0aejsKsEnmY0Kaon8uZCTXPsRH1gQNgg5D2gixdd1mJUvV3dE3y9FJr +XMoDkXdCGBodvKJyU6lcfEVF6/UxHcbBguZK9UtRHS9eJYm3rpL/5huQMCppX7kU +eQ8dpCwd3iKITqwd1ZudDqsWaU0vqzC2H55IyaZ/5/TnCk31Q1UP6BksbbuRcwOV +skEDsm6YoWDnn/IIzGOYnFJRzQH5jTz3j1QBvRIuQuBuvUkfhx1FEwhwZigrcxXu +MP+QgM54kezgziJUaZcOM2zF3lvrwMvXDMfNeIoJABv9ljw969xQ8czQCU5lMVmA +37ltv5Ec9U5hZuwk/9QO1Z+d/r6Jx0mlurS8gnCAKJgwa3kyZw6e4FZ8mYL4vpRR +hPdvRTWCMJkeB4yBHyhxUmTRgJHm6YR3D6hcFAc9cQcTEl/I60tMdz33G6m0O42s +Qt/+AR3YCY/RusWVBJB/qNS94EtNtj8iaebCQW1jHAhvGmFILVR9lzD0EzWKHkvy +WEjmUVRgCDd6Ne3eFRNS73gdv/C3l5boYySeu4exkEYVxVRn8DhCxs0MnkMHWFK6 +MyzXCCn+JnWFDYPfDKHvpff/kLDobtPBf+Lbch5wQy9quY27xaj0XwLyjOltpiST +LWae/Q4vAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqG +SIb3DQEBDQUAA4ICAQC9fUL2sZPxIN2mD32VeNySTgZlCEdVmlq471o/bDMP4B8g +nQesFRtXY2ZCjs50Jm73B2LViL9qlREmI6vE5IC8IsRBJSV4ce1WYxyXro5rmVg/ +k6a10rlsbK/eg//GHoJxDdXDOokLUSnxt7gk3QKpX6eCdh67p0PuWm/7WUJQxH2S +DxsT9vB/iZriTIEe/ILoOQF0Aqp7AgNCcLcLAmbxXQkXYCCSB35Vp06u+eTWjG0/ +pyS5V14stGtw+fA0DJp5ZJV4eqJ5LqxMlYvEZ/qKTEdoCeaXv2QEmN6dVqjDoTAo +k0t5u4YRXzEVCfXAC3ocplNdtCA72wjFJcSbfif4BSC8bDACTXtnPC7nD0VndZLp ++RiNLeiENhk0oTC+UVdSc+n2nJOzkCK0vYu0Ads4JGIB7g8IB3z2t9ICmsWrgnhd +NdcOe15BincrGA8avQ1cWXsfIKEjbrnEuEk9b5jel6NfHtPKoHc9mDpRdNPISeVa +wDBM1mJChneHt59Nh8Gah74+TM1jBsw4fhJPvoc7Atcg740JErb904mZfkIEmojC +VPhBHVQ9LHBAdM8qFI2kRK0IynOmAZhexlP/aT/kpEsEPyaZQlnBn3An1CRz8h0S +PApL8PytggYKeQmRhl499+6jLxcZ2IegLfqq41dzIjwHwTMplg+1pKIOVojpWA== +-----END CERTIFICATE----- + +key-direction 1 + +# +# 2048 bit OpenVPN static key +# +-----BEGIN OpenVPN Static key V1----- +e685bdaf659a25a200e2b9e39e51ff03 +0fc72cf1ce07232bd8b2be5e6c670143 +f51e937e670eee09d4f2ea5a6e4e6996 +5db852c275351b86fc4ca892d78ae002 +d6f70d029bd79c4d1c26cf14e9588033 +cf639f8a74809f29f72b9d58f9b8f5fe +fc7938eade40e9fed6cb92184abb2cc1 +0eb1a296df243b251df0643d53724cdb +5a92a1d6cb817804c4a9319b57d53be5 +80815bcfcb2df55018cc83fc43bc7ff8 +2d51f9b88364776ee9d12fc85cc7ea5b +9741c4f598c485316db066d52db4540e +212e1518a9bd4828219e24b20d88f598 +a196c9de96012090e333519ae18d3509 +9427e7b372d348d352dc4c85e18cd4b9 +3f8a56ddb2e64eb67adfc9b337157ff4 +-----END OpenVPN Static key V1----- + \ No newline at end of file