From a56ebcb1c847a4c1482545e378aec803dadda8c4 Mon Sep 17 00:00:00 2001 From: MRColor Date: Wed, 7 Feb 2024 11:58:48 +0100 Subject: [PATCH] ADD - speedshare app, new REL, donations options to support development --- .env.template | 7 +++++-- .resources/.www/.configs/app_config.json | 10 ++++++++++ README.md | 1 + docker-compose.yaml.template | 12 ++++++++++++ runme.ps1 | 14 ++++++++++++++ runme.sh | 16 ++++++++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) diff --git a/.env.template b/.env.template index c91dc3d..09f2931 100644 --- a/.env.template +++ b/.env.template @@ -12,7 +12,7 @@ # ###################################################################### ## PROJECT_VERSION -PROJECT_VERSION=3.2.7 +PROJECT_VERSION=3.3.2 ## PROJECT NAME COMPOSE_PROJECT_NAME=money4band DS_PROJECT_SERVER_URL=https://discord.com/invite/Fq8eeazBAD @@ -70,13 +70,16 @@ PROXYRACK_DEVICE_UUID=yourPROXYRACKDeviceUUID ## PROXYLITE Your Proxylite USER ID (to retrieve in your proxylite dashboard : Section : download -> look for Your USER ID , it should be a number like 123456 near you account name) PROXYLITE_USER_ID=yourPROXYLITEUserID -# BITPING +## BITPING # Bitping had a special first startup process , for legacy see manual setup documentation or use te setup script # Your Bitping account email # Your Bitping account password BITPING_EMAIL=yourBITPINGMail BITPING_PASSWD=yourBITPINGPw +## SPEEDSHARE Your SpeedShare authentication code +SPEEDSHARE_CODE=yourSPEEDSHARECode + # MYSTNODE # Mystnode have a special first startup process , see manual setup documentation or use te setup script MYSTNODE_DASHBOARD_PORT=4449 diff --git a/.resources/.www/.configs/app_config.json b/.resources/.www/.configs/app_config.json index fe51a15..356cab7 100644 --- a/.resources/.www/.configs/app_config.json +++ b/.resources/.www/.configs/app_config.json @@ -100,7 +100,17 @@ "--email":{}, "--password":{} } + }, + { + "name": "SPEEDSHARE", + "dashboard": "https://dashboard.speedshare.app/", + "link": "https://speedshare.app/?ref=mindlessnerd", + "image": "eldavo/speedshare", + "flags": { + "--code": {} + } } + ], "extra-apps":[ { diff --git a/README.md b/README.md index b4a3ff5..ec5ac71 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ Register an account on the app's sites clicking each apps' names in the followin | Go to [PROXYRACK](https://peer.proxyrack.com/ref/myoas6qttvhuvkzh8ffx90ns1ouhwgilfgamo5ex) | :white_check_mark: | :white_check_mark: |500|1| | Go to [PROXYLITE](https://proxylite.ru/?r=PJTKXWN3) | :white_check_mark: | :white_check_mark: |Unlimited|1| | Go to [BITPING](https://app.bitping.com?r=qm7mIuX3) | :white_check_mark: | :white_check_mark: |Unlimited|1| +| Go to [SpeedShare](https://speedshare.app/?ref=mindlessnerd) | :white_check_mark: | :x: | Unlimited | 1 | | Go to [MYSTNODE](https://mystnodes.co/?referral_code=Tc7RaS7Fm12K3Xun6mlU9q9hbnjojjl9aRBW8ZA9) | :white_check_mark: | :white_check_mark: |Unlimited|Unlimited| ## Scale Up with Multi-Proxy Support 🌐 diff --git a/docker-compose.yaml.template b/docker-compose.yaml.template index b28a6a0..fb8c22a 100644 --- a/docker-compose.yaml.template +++ b/docker-compose.yaml.template @@ -144,6 +144,18 @@ services: #ENABLE_BITPING mem_reservation: ${APP_MEM_RESERV_BIG} #ENABLE_BITPING mem_limit: ${APP_MEM_LIMIT_BIG} +# SPEEDSHARE CONTAINER +#ENABLE_SPEEDSHARE speedshare: +#ENABLE_SPEEDSHARE container_name: speedshare_$DEVICE_NAME +#ENABLE_SPEEDSHARE image: eldavo/speedshare:latest +#ENABLE_SPEEDSHARE environment: +#ENABLE_SPEEDSHARE - CODE=$SPEEDSHARE_CODE +#ENABLE_SPEEDSHARE # network_mode: service:tun2socks +#ENABLE_SPEEDSHARE restart: always +#ENABLE_SPEEDSHARE cpus: ${APP_CPU_LIMIT_BIG} +#ENABLE_SPEEDSHARE mem_reservation: ${APP_MEM_RESERV_BIG} +#ENABLE_SPEEDSHARE mem_limit: ${APP_MEM_LIMIT_BIG} + ### EXTRA APPS ### diff --git a/runme.ps1 b/runme.ps1 index 0745b3b..61eb460 100644 --- a/runme.ps1 +++ b/runme.ps1 @@ -152,6 +152,7 @@ function fn_unknown($REPLY) { # Function to exit the script gracefully # function fn_bye { colorprint "Green" "Share this app with your friends thank you!" + colorprint "Cyan" "Support the project development check the donation options in the README, on GitHub, or in our Discord. Every bit helps! 💙" print_and_log "Green" "Exiting the application...Bye!Bye!" exit 0 } @@ -1072,6 +1073,18 @@ function fn_setupApp() { colorprint "Red" "CID cannot be empty. Please try again." } } + "--code" { + toLog_ifDebug -l "[DEBUG]" -m "Starting auth code setup for ${CURRENT_APP} app" + colorprint "Default" "Find your auth code inside your ${CURRENT_APP} dashboard/profile." + colorprint "Green" "Enter your ${CURRENT_APP} auth code:" + $APP_CODE = Read-Host + if ($APP_CODE) { + (Get-Content ${ENV_FILENAME}) -replace "your${CURRENT_APP}Code", $APP_CODE | Set-Content ${ENV_FILENAME} + } + else { + colorprint "Red" "Code cannot be empty. Please try again." + } + } "--token" { toLog_ifDebug -l "[DEBUG]" -m "Starting token setup for ${CURRENT_APP} app" colorprint "DEFAULT" "Find your token inside your ${CURRENT_APP} dashboard/profile." @@ -1760,6 +1773,7 @@ function mainmenu { check_project_updates adaptLimits colorprint "GREEN" "---------------------------------------------- " + colorprint "CYAN" "Support the project development check the donation options in the README, on GitHub, or in our Discord. Every bit helps! 💙" colorprint "MAGENTA" "Join our Discord community for updates, help, and discussions: $DS_PROJECT_SERVER_URL" colorprint "MAGENTA" "---------------------------------------------- " colorprint "DEFAULT" "Detected OS type: $($script:OS_TYPE)" diff --git a/runme.sh b/runme.sh index 54f8c91..efbf70a 100644 --- a/runme.sh +++ b/runme.sh @@ -143,6 +143,7 @@ fn_unknown() { # Function to exit the script gracefully # fn_bye(){ colorprint "GREEN" "Share this app with your friends thank you!" + colorprint "CYAN" "Support the project development check the donation options in the README, on GitHub, or in our Discord. Every bit helps! 💙" print_and_log "GREEN" "Exiting the application...Bye!Bye!" exit 0 } @@ -1033,6 +1034,20 @@ fn_setupApp() { fi done ;; + --code) + toLog_ifDebug -l "[DEBUG]" -m "Starting auth code setup for ${CURRENT_APP} app" + colorprint "DEFAULT" "Find your auth code inside your ${CURRENT_APP} dashboard/profile." + while true; do + colorprint "GREEN" "Enter your ${CURRENT_APP} auth code:" + read -r APP_CODE + if [[ -z "$APP_CODE" ]]; then + colorprint "RED" "Code cannot be empty. Please try again." + else + sed -i "s/your${CURRENT_APP}Code/$APP_CODE/" ${ENV_FILENAME} + break + fi + done + ;; --token) toLog_ifDebug -l "[DEBUG]" -m "Starting token setup for ${CURRENT_APP} app" colorprint "DEFAULT" "Find your token inside your ${CURRENT_APP} dashboard/profile." @@ -1587,6 +1602,7 @@ mainmenu() { check_project_updates fn_adaptLimits colorprint "GREEN" "---------------------------------------------- " + colorprint "CYAN" "Support the project development check the donation options in the README, on GitHub, or in our Discord. Every bit helps! 💙" colorprint "MAGENTA" "Join our Discord community for updates, help, and discussions: ${DS_PROJECT_SERVER_URL}" colorprint "MAGENTA" "---------------------------------------------- " colorprint "DEFAULT" "Detected OS type: ${OS_TYPE}"$'\n'"Detected architecture: $ARCH"$'\n'"Docker $DKARCH image architecture will be used if the app's image permits it"$'\n'"---------------------------------------------- "$'\n'