REL - new hostnames and better container names, new speedshare variab…

…les and flags, improved claim statements, new project version and simplified notification variables
Angelajzr · Feb 12, 2024 · b5b3d32 · b5b3d32
1 parent dce47fd
commit b5b3d32
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 39 deletions.
diff --git a/.env.template b/.env.template
@@ -12,7 +12,7 @@
 #
 ######################################################################
 ## PROJECT_VERSION
-PROJECT_VERSION=3.3.11
+PROJECT_VERSION=3.3.12
 ## PROJECT NAME
 COMPOSE_PROJECT_NAME=money4band
 DS_PROJECT_SERVER_URL=https://discord.com/invite/Fq8eeazBAD
@@ -79,6 +79,7 @@ BITPING_PASSWD=yourBITPINGPw
 
 ## SPEEDSHARE Your SpeedShare authentication code
 SPEEDSHARE_CODE=yourSPEEDSHARECode
+SPEEDSHARE_DEVICE_UUID=yourSPEEDSHAREDeviceUUID
 
 # MYSTNODE
 # Mystnode have a special first startup process , see manual setup documentation or use te setup script

diff --git a/.resources/.www/.configs/app_config.json b/.resources/.www/.configs/app_config.json
@@ -10,7 +10,7 @@
           "length": 32
         }
       },
-      "claimURLBase": "https://earnapp.com/r/sdk-node-"
+      "claimURLBase": "To claim your node, after starting it, go to the app's dashboard and then visit the following link: https://earnapp.com/r/sdk-node-"
     },
     {
       "name": "HONEYGAIN",
@@ -80,7 +80,7 @@
           "length": 64
         }
       },
-      "claimURLBase": "https://peer.proxyrack.com/devices?"
+      "claimURLBase": "To claim your node, after starting it, go to the app's dashboard and then add the device using the following UUID: "
     },
     {
       "name": "PROXYLITE",
@@ -105,10 +105,14 @@
     "name": "SPEEDSHARE",
     "dashboard": "https://dashboard.speedshare.app/",
     "link": "https://speedshare.app/?ref=mindlessnerd",
-    "image": "eldavo/speedshare",
+    "image": "mrcolorrain/speedshare",
     "flags": {
-      "--code": {}
-    }
+      "--code": {},
+      "--uuid": {
+        "length": 32
+      }
+    },
+    "claimURLBase": "Speedshare nodes are automatically claimed. After starting it, go to the app's dashboard to see it. Its UUID is: "
   }
 
   ],

diff --git a/docker-compose.yaml.template b/docker-compose.yaml.template
@@ -10,7 +10,8 @@ services:
 
 # EARNAPP CONTAINER
 #ENABLE_EARNAPP  earnapp:
-#ENABLE_EARNAPP    container_name: earnapp_$DEVICE_NAME
+#ENABLE_EARNAPP    container_name: ${DEVICE_NAME}_earnapp
+#ENABLE_EARNAPP    hostname: ${DEVICE_NAME}_earnapp
 #ENABLE_EARNAPP    image: fazalfarhan01/earnapp:lite
 #ENABLE_EARNAPP    environment:
 #ENABLE_EARNAPP      - EARNAPP_UUID=$EARNAPP_DEVICE_UUID
@@ -25,20 +26,22 @@ services:
 
 # HONEYGAIN CONTAINER
 #ENABLE_HONEYGAIN  honeygain:
-#ENABLE_HONEYGAIN    container_name: honeygain_$DEVICE_NAME
+#ENABLE_HONEYGAIN    container_name: ${DEVICE_NAME}_honeygain
+#ENABLE_HONEYGAIN    hostname: ${DEVICE_NAME}_honeygain
 #ENABLE_HONEYGAIN    image: honeygain/honeygain:latest
-#ENABLE_HONEYGAIN    # network_mode: service:tun2socks
 #ENABLE_HONEYGAIN    environment:
 #ENABLE_HONEYGAIN      - HONEYGAIN_DUMMY=''
 #ENABLE_HONEYGAIN    command: -tou-accept -email $HONEYGAIN_EMAIL -pass $HONEYGAIN_PASSWD -device $DEVICE_NAME
+#ENABLE_HONEYGAIN    # network_mode: service:tun2socks
 #ENABLE_HONEYGAIN    restart: always
 #ENABLE_HONEYGAIN    cpus: ${APP_CPU_LIMIT_MEDIUM}
 #ENABLE_HONEYGAIN    mem_reservation: ${APP_MEM_RESERV_MEDIUM}
 #ENABLE_HONEYGAIN    mem_limit: ${APP_MEM_LIMIT_MEDIUM}
 
 # IPROYALPAWNS CONTAINER
-#ENABLE_IPROYALPAWNS  iproyal:
-#ENABLE_IPROYALPAWNS    container_name: iproyal_$DEVICE_NAME
+#ENABLE_IPROYALPAWNS  iproyalpawns:
+#ENABLE_IPROYALPAWNS    container_name: ${DEVICE_NAME}_iproyalpawns
+#ENABLE_IPROYALPAWNS    hostname: ${DEVICE_NAME}_iproyalpawns
 #ENABLE_IPROYALPAWNS    image: iproyal/pawns-cli:latest
 #ENABLE_IPROYALPAWNS    environment:
 #ENABLE_IPROYALPAWNS      - IPROYALPAWNS_DUMMY=''
@@ -51,7 +54,8 @@ services:
 
 # PACKETSTREAM CONTAINER
 #ENABLE_PACKETSTREAM  packetstream:
-#ENABLE_PACKETSTREAM    container_name: packetstream_$DEVICE_NAME
+#ENABLE_PACKETSTREAM    container_name: ${DEVICE_NAME}_packetstream
+#ENABLE_PACKETSTREAM    hostname: ${DEVICE_NAME}_packetstream
 #ENABLE_PACKETSTREAM    image: packetstream/psclient:latest
 #ENABLE_PACKETSTREAM    environment:
 #ENABLE_PACKETSTREAM      - CID=$PACKETSTREAM_CID
@@ -63,7 +67,8 @@ services:
 
 # TRAFFMONETIZER CONTAINER
 #ENABLE_TRAFFMONETIZER  traffMonetizer:
-#ENABLE_TRAFFMONETIZER    container_name: traffmonetizer_$DEVICE_NAME
+#ENABLE_TRAFFMONETIZER    container_name: ${DEVICE_NAME}_traffmonetizer
+#ENABLE_TRAFFMONETIZER    hostname: ${DEVICE_NAME}_traffmonetizer
 #ENABLE_TRAFFMONETIZER    image: traffmonetizer/cli_v2:latest
 #ENABLE_TRAFFMONETIZER    environment:
 #ENABLE_TRAFFMONETIZER      - TRAFFMONETIZER_DUMMY=''
@@ -76,7 +81,8 @@ services:
 
 # REPOCKET CONTAINER
 #ENABLE_REPOCKET  repocket:
-#ENABLE_REPOCKET    container_name: repocket_$DEVICE_NAME
+#ENABLE_REPOCKET    container_name: ${DEVICE_NAME}_repocket
+#ENABLE_REPOCKET    hostname: ${DEVICE_NAME}_repocket
 #ENABLE_REPOCKET    image: repocket/repocket:latest
 #ENABLE_REPOCKET    environment:
 #ENABLE_REPOCKET        - RP_EMAIL=$REPOCKET_EMAIL
@@ -89,7 +95,8 @@ services:
 
 # EARNFM CONTAINER
 #ENABLE_EARNFM  earnfm:
-#ENABLE_EARNFM    container_name: earnfm_$DEVICE_NAME
+#ENABLE_EARNFM    container_name: ${DEVICE_NAME}_earnfm
+#ENABLE_EARNFM    hostname: ${DEVICE_NAME}_earnfm
 #ENABLE_EARNFM    image: earnfm/earnfm-client:latest
 #ENABLE_EARNFM    environment:
 #ENABLE_EARNFM        - EARNFM_TOKEN=$EARNFM_APIKEY
@@ -101,7 +108,8 @@ services:
 
 # PROXYRACK CONTAINER
 #ENABLE_PROXYRACK  proxyrack:
-#ENABLE_PROXYRACK    container_name: proxyrack_$DEVICE_NAME
+#ENABLE_PROXYRACK    container_name: ${DEVICE_NAME}_proxyrack
+#ENABLE_PROXYRACK    hostname: ${DEVICE_NAME}_proxyrack
 #ENABLE_PROXYRACK    image: proxyrack/pop:latest
 #ENABLE_PROXYRACK    environment:
 #ENABLE_PROXYRACK        - api_key=$PROXYRACK_APIKEY
@@ -115,7 +123,8 @@ services:
 
 # PROXYLITE CONTAINER
 #ENABLE_PROXYLITE  proxylite:
-#ENABLE_PROXYLITE    container_name: proxylite_$DEVICE_NAME
+#ENABLE_PROXYLITE    container_name: ${DEVICE_NAME}_proxylite
+#ENABLE_PROXYLITE    hostname: ${DEVICE_NAME}_proxylite
 #ENABLE_PROXYLITE    image: proxylite/proxyservice:latest
 #ENABLE_PROXYLITE    environment:
 #ENABLE_PROXYLITE      - USER_ID=$PROXYLITE_USER_ID
@@ -126,9 +135,9 @@ services:
 #ENABLE_PROXYLITE    mem_limit: ${APP_MEM_LIMIT_BIG}
 
 # BITPING CONTAINER 
-# For this app you'll need a one-time operation to claim your node: the first time if you do not have a backup of your identity you will need to enter manually your credentials to initialize it use : sudo docker run --rm -it -v ${PWD}/.data/.bitping/:/root/.bitping bitping/bitping-node:latest , then enter your credential , once this is done CTRL+C to end container and then if using bind folder just use docker compose to restart it as always, if you use the docker volume mount it in the previous comamnd or copy the created credentials in the volume using ' docker cp ${PWD}/.data/.bitping bitping:/root/' or just mount the volume in the interactive temporary container
 #ENABLE_BITPING  bitping:
-#ENABLE_BITPING    container_name: bitping_$DEVICE_NAME
+#ENABLE_BITPING    container_name: ${DEVICE_NAME}_bitping
+#ENABLE_BITPING    hostname: ${DEVICE_NAME}_bitping
 #ENABLE_BITPING    image: mrcolorrain/bitping:latest
 #ENABLE_BITPING    environment:
 #ENABLE_BITPING      - BITPING_EMAIL=$BITPING_EMAIL
@@ -146,8 +155,9 @@ services:
 
 # SPEEDSHARE CONTAINER
 #ENABLE_SPEEDSHARE  speedshare:
-#ENABLE_SPEEDSHARE    container_name: speedshare_$DEVICE_NAME
-#ENABLE_SPEEDSHARE    image: eldavo/speedshare:latest
+#ENABLE_SPEEDSHARE    container_name: ${DEVICE_NAME}_speedshare
+#ENABLE_SPEEDSHARE    hostname: ${DEVICE_NAME}_speedshare
+#ENABLE_SPEEDSHARE    image: mrcolorrain/speedshare:latest
 #ENABLE_SPEEDSHARE    environment:
 #ENABLE_SPEEDSHARE      - CODE=$SPEEDSHARE_CODE
 #ENABLE_SPEEDSHARE    # network_mode: service:tun2socks
@@ -159,9 +169,10 @@ services:
 
 ### EXTRA APPS ###
 
-# MYSTERIUM CONTAINER
-#ENABLE_MYSTNODE  mysterium:
-#ENABLE_MYSTNODE    container_name: mystnode_$DEVICE_NAME
+# MYSTERIUM MYSTNODE CONTAINER
+#ENABLE_MYSTNODE  mystnode:
+#ENABLE_MYSTNODE    container_name: ${DEVICE_NAME}_mystnode
+#ENABLE_MYSTNODE    hostname: ${DEVICE_NAME}_mystnode
 #ENABLE_MYSTNODE    image: mysteriumnetwork/myst:latest
 #ENABLE_MYSTNODE    environment:
 #ENABLE_MYSTNODE      - MYSTNODE_DUMMY=''
@@ -183,7 +194,8 @@ services:
 
 # PEER2PROFIT CONTAINER
 #ENABLE_PEER2PROFIT  peer2profit:
-#ENABLE_PEER2PROFIT    container_name: peer2profit_$DEVICE_NAME
+#ENABLE_PEER2PROFIT    container_name: ${DEVICE_NAME}_peer2profit
+#ENABLE_PEER2PROFIT    hostname: ${DEVICE_NAME}_peer2profit
 #ENABLE_PEER2PROFIT    image: mrcolorrain/peer2profit:latest
 #ENABLE_PEER2PROFIT    environment:
 #ENABLE_PEER2PROFIT      - P2P_EMAIL=$PEER2PROFIT_EMAIL
@@ -199,49 +211,51 @@ services:
 
 # TUN2SOCKS CONTAINER
 #ENABLE_PROXY  tun2socks:
+#ENABLE_PROXY    container_name: ${DEVICE_NAME}_tun2socks
+#ENABLE_PROXY    hostname: ${DEVICE_NAME}_tun2socks
 #ENABLE_PROXY    image: xjasonlyu/tun2socks
-#ENABLE_PROXY    container_name: tun2socks_$DEVICE_NAME
-#ENABLE_PROXY    restart: always
-#ENABLE_PROXY    command: ["/bin/sh", "-c", "echo 'nameserver 1.1.1.1\nnameserver 8.8.8.8' > /etc/resolv.conf && ip rule add iif lo ipproto udp dport 53 lookup main && ip rule add iif lo ipproto udp dport 3478 lookup main"]
 #ENABLE_PROXY    environment:
 #ENABLE_PROXY      - LOGLEVEL=info
 #ENABLE_PROXY      - PROXY=$STACK_PROXY
-#ENABLE_PROXY    volumes:
-#ENABLE_PROXY      - '/dev/net/tun:/dev/net/tun'
+#ENABLE_PROXY    command: ["/bin/sh", "-c", "echo 'nameserver 1.1.1.1\nnameserver 8.8.8.8' > /etc/resolv.conf && ip rule add iif lo ipproto udp dport 53 lookup main && ip rule add iif lo ipproto udp dport 3478 lookup main"]
 #ENABLE_PROXY    cap_add:
 #ENABLE_PROXY      - NET_ADMIN
+#ENABLE_PROXY    volumes:
+#ENABLE_PROXY      - '/dev/net/tun:/dev/net/tun'
+#ENABLE_PROXY    restart: always
 #ENABLE_PROXY    cpus: ${APP_CPU_LIMIT_BIG}
 #ENABLE_PROXY    mem_reservation: ${APP_MEM_RESERV_BIG}
 #ENABLE_PROXY    mem_limit: ${APP_MEM_LIMIT_BIG}
 
 
 # WATCHTOWER AUTO-UPDATER AND NOTIFICATIONS
   watchtower:
-    container_name: watchtower_$DEVICE_NAME
+    container_name: ${DEVICE_NAME}_watchtower
+    hostname: ${DEVICE_NAME}_watchtower
     image: containrrr/watchtower:latest
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     environment:
       - WATCHTOWER_POLL_INTERVAL=14400
       # - WATCHTOWER_NOTIFICATIONS=shoutrrr
       # - WATCHTOWER_NOTIFICATION_URL=$SHOUTRRR_URL
-      # - WATCHTOWER_NOTIFICATIONS_HOSTNAME=$DEVICE_NAME
       - WATCHTOWER_ROLLING_RESTART=true
       - WATCHTOWER_NO_STARTUP_MESSAGE=true
       - WATCHTOWER_CLEANUP=true
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
     restart: always
     cpus: ${APP_CPU_LIMIT_MEDIUM}
     mem_reservation: ${APP_MEM_RESERV_MEDIUM}
     mem_limit: ${APP_MEM_LIMIT_MEDIUM}
 
 # WEB DASBOARD
   m4bwebdashboard:
-    container_name: webdashboard_$DEVICE_NAME
+    container_name: ${DEVICE_NAME}_webdashboard
+    hostname: ${DEVICE_NAME}_webdashboard
     image: nginx:alpine-slim
-    volumes:
-      - ./.resources/.www:/usr/share/nginx/html:ro
     ports:
       - ${M4B_DASHBOARD_PORT}:80
+    volumes:
+      - ./.resources/.www:/usr/share/nginx/html:ro
     restart: always
     cpus: ${APP_CPU_LIMIT_LITTLE}
     mem_reservation: ${APP_MEM_RESERV_LITTLE}

diff --git a/runme.ps1 b/runme.ps1
@@ -789,7 +789,6 @@ function fn_setupNotifications {
                     (Get-Content .\${ENV_FILENAME}).replace("SHOUTRRR_URL=${CURRENT_VALUE}", "SHOUTRRR_URL=${SHOUTRRR_URL}") | Set-Content .\${ENV_FILENAME}
                     (Get-Content .\$DKCOM_FILENAME).replace('# - WATCHTOWER_NOTIFICATIONS=shoutrrr', "- WATCHTOWER_NOTIFICATIONS=shoutrrr") | Set-Content .\$DKCOM_FILENAME
                     (Get-Content .\$DKCOM_FILENAME).replace('# - WATCHTOWER_NOTIFICATION_URL', "- WATCHTOWER_NOTIFICATION_URL") | Set-Content .\$DKCOM_FILENAME
-                    (Get-Content .\$DKCOM_FILENAME).replace('# - WATCHTOWER_NOTIFICATIONS_HOSTNAME', "- WATCHTOWER_NOTIFICATIONS_HOSTNAME") | Set-Content .\$DKCOM_FILENAME
                     (Get-Content .\${ENV_FILENAME}).replace("NOTIFICATIONS_CONFIGURATION_STATUS=0", "NOTIFICATIONS_CONFIGURATION_STATUS=1") | Set-Content .\${ENV_FILENAME}
                     colorprint "DEFAULT" "Notifications setup complete. If the link is correct, you will receive a notification for each update made on the app container images."
                     Read-Host -p "Press enter to continue"

diff --git a/runme.sh b/runme.sh
@@ -764,7 +764,6 @@ fn_setupNotifications() {
                         sed -i "s~SHOUTRRR_URL=${CURRENT_VALUE}~SHOUTRRR_URL=$SHOUTRRR_URL~" ${ENV_FILENAME}
                         sed -i "s~# - WATCHTOWER_NOTIFICATIONS=shoutrrr~- WATCHTOWER_NOTIFICATIONS=shoutrrr~" "$DKCOM_FILENAME"
                         sed -i "s~# - WATCHTOWER_NOTIFICATION_URL~- WATCHTOWER_NOTIFICATION_URL~" "$DKCOM_FILENAME"
-                        sed -i "s~# - WATCHTOWER_NOTIFICATIONS_HOSTNAME~- WATCHTOWER_NOTIFICATIONS_HOSTNAME~" "$DKCOM_FILENAME"
                         sed -i 's/NOTIFICATIONS_CONFIGURATION_STATUS=0/NOTIFICATIONS_CONFIGURATION_STATUS=1/' ${ENV_FILENAME}
                         colorprint "DEFAULT" "Notifications setup complete. If the link is correct, you will receive a notification for each update made on the app container images."
                         read -r -p "Press enter to continue."