From 63b4275a20dafe8928d4528d60263f1714eaa24f Mon Sep 17 00:00:00 2001 From: umer Date: Sat, 14 Oct 2023 23:30:53 -0400 Subject: [PATCH 1/2] change --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d68568a..dc2f916 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "basescript"] path = basescript - url = https://github.com/evertramos/basescript.git + url = https://github.com/StandardSoft/basescript.git From cb76e673f4646d1e752963d3fb7fdd7ae57ac59d Mon Sep 17 00:00:00 2001 From: umer Date: Sun, 15 Oct 2023 11:17:22 -0400 Subject: [PATCH 2/2] updated repo --- .env.sample | 2 +- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/README.md | 14 ++++++------ bin/fix-git-submodule.sh | 2 +- bin/fresh-start.sh | 2 +- bin/install.sh | 4 ++-- bin/localscript/bootstrap.sh | 2 +- ...-docker-nginx-proxy-automation-env-file.sh | 2 +- bin/localscript/check-local-env-file.sh | 2 +- bin/localscript/update-docker-compose-file.sh | 2 +- .../update-env-new-site-variables.sh | 2 +- bin/localscript/usage-fresh-start.sh | 2 +- bin/revert.sh | 2 +- bin/ssl_test.sh | 2 +- bin/stop.sh | 2 +- bin/test.sh | 2 +- bin/update-branch-name.sh | 2 +- bin/update-checksum.sh | 2 +- bin/update-nginx-template.sh | 2 +- docs/README.md | 22 +++++++++---------- docs/upgrade-guide.md | 4 ++-- 21 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.env.sample b/.env.sample index b455fed..5f459c7 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # NGINX Proxy automation # diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index d05a534..fca3b99 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,7 +7,7 @@ assignees: evertramos --- -**Check [Discussions](https://github.com/evertramos/nginx-proxy-automation/discussions) to see if there is an answer might help you before opening an issue** +**Check [Discussions](https://github.com/StandardSoft/nginx-proxy-automation/discussions) to see if there is an answer might help you before opening an issue** **Describe the bug** A clear and concise description of what the bug is. diff --git a/.github/README.md b/.github/README.md index c1e762b..0fb5333 100644 --- a/.github/README.md +++ b/.github/README.md @@ -11,20 +11,20 @@

- +

## How to start πŸ”° -[![shell script](https://img.shields.io/badge/Shell_Script-121011?style=for-the-badge&logo=gnu-bash&logoColor=white)](https://github.com/evertramos) +[![shell script](https://img.shields.io/badge/Shell_Script-121011?style=for-the-badge&logo=gnu-bash&logoColor=white)](https://github.com/StandardSoft) 1. Clone this repository using the option **_--recurse-submodules_** ⚠️ ```bash -git clone --recurse-submodules https://github.com/evertramos/nginx-proxy-automation.git proxy +git clone --recurse-submodules https://github.com/StandardSoft/nginx-proxy-automation.git proxy ``` -We use submodule for [basescript](https://github.com/evertramos/basescript) +We use submodule for [basescript](https://github.com/StandardSoft/basescript) 2. πŸš€ Run the script 'fresh_start.sh' from the _./proxy/bin_ folder @@ -69,9 +69,9 @@ I made a tutorial video to walk you through this project: ## Server Automation πŸš€ -Make user you try our [Server Automation](https://github.com/evertramos/server-automation) +Make user you try our [Server Automation](https://github.com/StandardSoft/server-automation) -[https://github.com/evertramos/server-automation](https://github.com/evertramos/server-automation) +[https://github.com/StandardSoft/server-automation](https://github.com/StandardSoft/server-automation) ## Further information πŸ““ @@ -81,7 +81,7 @@ For more installation details please [click here](/docs/). [![Patreon](https://img.shields.io/badge/Patreon-F96854?style=for-the-badge&logo=patreon&logoColor=white)](https://www.patreon.com/evertramos) [![image](https://img.shields.io/badge/picpay-21C25E?style=for-the-badge&logo=picpay&logoColor=white)](https://picpay.me/evert.ramos) -[List of all supporters](https://github.com/evertramos/evertramos/blob/main/pages/supporters.md). +[List of all supporters](https://github.com/StandardSoft/evertramos/blob/main/pages/supporters.md). ## Code Contributors diff --git a/bin/fix-git-submodule.sh b/bin/fix-git-submodule.sh index 4682dc6..3faa9c1 100755 --- a/bin/fix-git-submodule.sh +++ b/bin/fix-git-submodule.sh @@ -3,7 +3,7 @@ # # This script updates the branch name to 'main' # -# Source: https://github.com/evertramos/nginx-proxy-automation +# Source: https://github.com/StandardSoft/nginx-proxy-automation # # Get the script name and its real file path diff --git a/bin/fresh-start.sh b/bin/fresh-start.sh index e2410b5..0a189ad 100755 --- a/bin/fresh-start.sh +++ b/bin/fresh-start.sh @@ -4,7 +4,7 @@ # # Fresh Start script - set up nginx-proxy in a fresh installed server # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # Script developed by # Evert Ramos diff --git a/bin/install.sh b/bin/install.sh index 7a24be9..2a243fb 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -4,7 +4,7 @@ # # Install script - configure the requirements for this project # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # Script developed by # Evert Ramos @@ -26,7 +26,7 @@ BASESCRIPT_BASE_PATH=${SCRIPT_PATH}/../src/scripts mkdir -p ${BASESCRIPT_BASE_PATH} cd ${BASESCRIPT_BASE_PATH} rm -rf "basescript" -git clone https://github.com/evertramos/basescript.git &> /dev/null +git clone https://github.com/StandardSoft/basescript.git &> /dev/null cd basescript git checkout ${BASESCRIPT_VERSION} &> /dev/null cd ${SCRIPT_PATH} diff --git a/bin/localscript/bootstrap.sh b/bin/localscript/bootstrap.sh index 6a0c23c..edb357e 100755 --- a/bin/localscript/bootstrap.sh +++ b/bin/localscript/bootstrap.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/localscript/check-docker-nginx-proxy-automation-env-file.sh b/bin/localscript/check-docker-nginx-proxy-automation-env-file.sh index e0f4afc..e6e4ef9 100755 --- a/bin/localscript/check-docker-nginx-proxy-automation-env-file.sh +++ b/bin/localscript/check-docker-nginx-proxy-automation-env-file.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/localscript/check-local-env-file.sh b/bin/localscript/check-local-env-file.sh index d583bdc..f02c980 100755 --- a/bin/localscript/check-local-env-file.sh +++ b/bin/localscript/check-local-env-file.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/localscript/update-docker-compose-file.sh b/bin/localscript/update-docker-compose-file.sh index c2fe4ab..619e27d 100755 --- a/bin/localscript/update-docker-compose-file.sh +++ b/bin/localscript/update-docker-compose-file.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/localscript/update-env-new-site-variables.sh b/bin/localscript/update-env-new-site-variables.sh index 26336db..8481343 100755 --- a/bin/localscript/update-env-new-site-variables.sh +++ b/bin/localscript/update-env-new-site-variables.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/localscript/usage-fresh-start.sh b/bin/localscript/usage-fresh-start.sh index 9496cb9..3c884b1 100755 --- a/bin/localscript/usage-fresh-start.sh +++ b/bin/localscript/usage-fresh-start.sh @@ -1,6 +1,6 @@ #----------------------------------------------------------------------- # -# Server Automation - https://github.com/evertramos/server-automation +# Server Automation - https://github.com/StandardSoft/server-automation # # Developed by # Evert Ramos diff --git a/bin/revert.sh b/bin/revert.sh index d205964..79bc09a 100755 --- a/bin/revert.sh +++ b/bin/revert.sh @@ -3,7 +3,7 @@ # # This script revert the fresh start script to git branch # -# Source: https://github.com/evertramos/nginx-proxy-automation +# Source: https://github.com/StandardSoft/nginx-proxy-automation # # Get the script name and its real file path diff --git a/bin/ssl_test.sh b/bin/ssl_test.sh index 31d8ace..dcce84b 100755 --- a/bin/ssl_test.sh +++ b/bin/ssl_test.sh @@ -4,7 +4,7 @@ # # test-proxy script - testing nginx-proxy # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # Script developed by # Evert Ramos diff --git a/bin/stop.sh b/bin/stop.sh index e66055f..7ecfdd1 100755 --- a/bin/stop.sh +++ b/bin/stop.sh @@ -4,7 +4,7 @@ # # test-proxy script - testing nginx-proxy # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # Script developed by # Evert Ramos diff --git a/bin/test.sh b/bin/test.sh index 61d9482..7dcf2b8 100755 --- a/bin/test.sh +++ b/bin/test.sh @@ -4,7 +4,7 @@ # # test-proxy script - testing nginx-proxy # -# https://github.com/evertramos/nginx-proxy-automation +# https://github.com/StandardSoft/nginx-proxy-automation # # Script developed by # Evert Ramos diff --git a/bin/update-branch-name.sh b/bin/update-branch-name.sh index 8fcb743..19c1d9c 100755 --- a/bin/update-branch-name.sh +++ b/bin/update-branch-name.sh @@ -3,7 +3,7 @@ # # This script updates the branch name to 'main' # -# Source: https://github.com/evertramos/nginx-proxy-automation +# Source: https://github.com/StandardSoft/nginx-proxy-automation # # Get the script name and its real file path diff --git a/bin/update-checksum.sh b/bin/update-checksum.sh index af67e49..8719a25 100755 --- a/bin/update-checksum.sh +++ b/bin/update-checksum.sh @@ -4,7 +4,7 @@ # # Update checksum in .env files # -# Part of https://github.com/evertramos/nginx-proxy-automation +# Part of https://github.com/StandardSoft/nginx-proxy-automation # # Script written by # Evert Ramos diff --git a/bin/update-nginx-template.sh b/bin/update-nginx-template.sh index 26ebd42..6bd674f 100755 --- a/bin/update-nginx-template.sh +++ b/bin/update-nginx-template.sh @@ -3,7 +3,7 @@ # # This script updates the branch name to 'main' # -# Source: https://github.com/evertramos/nginx-proxy-automation +# Source: https://github.com/StandardSoft/nginx-proxy-automation # # Get the script name and its real file path diff --git a/docs/README.md b/docs/README.md index b7e449f..9ee2175 100644 --- a/docs/README.md +++ b/docs/README.md @@ -7,13 +7,13 @@ auto renewing LetΒ΄s Encrypt certificates! ❀️ We strongly recommend you (please do! πŸ™) to read all documentation before starting in production as well as the [nginx-proxy docs](https://github.com/nginx-proxy/nginx-proxy). -> To access the previous version of this project please access [version 0.4](https://github.com/evertramos/nginx-proxy-automation/tree/v0.4). +> To access the previous version of this project please access [version 0.4](https://github.com/StandardSoft/nginx-proxy-automation/tree/v0.4). ### Upgrading from previous version If you are upgrading from the previous version please follow the guide below carefully: -https://github.com/evertramos/nginx-proxy-automation/blob/master/docs/upgrade-guide.md +https://github.com/StandardSoft/nginx-proxy-automation/blob/master/docs/upgrade-guide.md ## Prerequisites @@ -27,7 +27,7 @@ In order to use this compose file (docker-compose.yml) you must have: 3. Docker-compose installed (https://docs.docker.com/compose/install/) -> I have an [easy-server](https://github.com/evertramos/easy-server) for myself which I use to install +> I have an [easy-server](https://github.com/StandardSoft/easy-server) for myself which I use to install > docker and docker-compose in new servers and some aliases and other stuff. Feel free to use it, **but** > it is not related to this repo and maintainance it's for my own use only. Check './install/docker' folder. @@ -43,11 +43,11 @@ Also, you will need to make sure you have: 1. Clone this repository **using the option _--recurse-submodules_**: ```bash -git clone --recurse-submodules https://github.com/evertramos/nginx-proxy-automation.git proxy +git clone --recurse-submodules https://github.com/StandardSoft/nginx-proxy-automation.git proxy ``` > Make sure you use the option '--recurse-submodules' once we use an external module in this project, please check -> [basescript](https://github.com/evertramos/basescript) +> [basescript](https://github.com/StandardSoft/basescript) > Please note we use 'proxy' as folder at the end. But you can change it to whatever fits you better @@ -161,7 +161,7 @@ Where *${NGINX_WEB}* is your proxy container name, which in the original `.env` 5. **sudo** options -If you need to save the nginx-proxy data files in a folder which the user running 'fresh-start.sh' script does not have access, you might accomplish that using _sudo_. In order to allow the script to run some commands with _sudo_ you need to set _true_ to the variable ['ALLOW_RUN_WITH_SUDO'](https://github.com/evertramos/nginx-proxy-automation/blob/d48b2477ed28cbda37738046079e35df219ba3e9/.env.sample#L20) at '.env.sample' file **before** running fresh-start.sh script, as of: +If you need to save the nginx-proxy data files in a folder which the user running 'fresh-start.sh' script does not have access, you might accomplish that using _sudo_. In order to allow the script to run some commands with _sudo_ you need to set _true_ to the variable ['ALLOW_RUN_WITH_SUDO'](https://github.com/StandardSoft/nginx-proxy-automation/blob/d48b2477ed28cbda37738046079e35df219ba3e9/.env.sample#L20) at '.env.sample' file **before** running fresh-start.sh script, as of: ```bash # Allow run commands with sudo if needed @@ -207,13 +207,13 @@ If you are using this project in production enviroment, check all license involv ## Other projects using nginx-proxy Following are links to docker containers using this web proxy: -1. [docker-wordpress-letsencrypt](https://github.com/evertramos/docker-wordpress-letsencrypt) -2. [docker-portainer-letsencrypt](https://github.com/evertramos/docker-portainer-letsencrypt) -3. [docker-nextcloud-letsencrypt](https://github.com/evertramos/docker-nextcloud-letsencrypt) -4. [docker-registry-letsencrypt](https://github.com/evertramos/docker-registry-letsencrypt) +1. [docker-wordpress-letsencrypt](https://github.com/StandardSoft/docker-wordpress-letsencrypt) +2. [docker-portainer-letsencrypt](https://github.com/StandardSoft/docker-portainer-letsencrypt) +3. [docker-nextcloud-letsencrypt](https://github.com/StandardSoft/docker-nextcloud-letsencrypt) +4. [docker-registry-letsencrypt](https://github.com/StandardSoft/docker-registry-letsencrypt) 5. [gitlab-docker-letsencrypt](https://github.com/steevepay/gitlab-docker-letsencrypt) 6. [docker-webtrees-letsencrypt](https://github.com/mstroppel/docker-webtrees-letsencrypt) ## Running this Proxy on a Synology NAS -Please checkout this [howto](https://github.com/evertramos/nginx-proxy-automation/blob/master/docs/HOWTO-Synlogy.md). +Please checkout this [howto](https://github.com/StandardSoft/nginx-proxy-automation/blob/master/docs/HOWTO-Synlogy.md). diff --git a/docs/upgrade-guide.md b/docs/upgrade-guide.md index 26498ce..f61a170 100644 --- a/docs/upgrade-guide.md +++ b/docs/upgrade-guide.md @@ -48,7 +48,7 @@ So, let's go. First thing first! 2.4 Set the **basescript** submodule - If you notice the submodule folder used in this project ([basescript](https://github.com/evertramos/basescript/)) + If you notice the submodule folder used in this project ([basescript](https://github.com/StandardSoft/basescript/)) is present in the master branch we just checkout, but it is empty, so we need to fix it (init and update). ```bash @@ -130,4 +130,4 @@ So, let's go. First thing first! $ rm docker-compose-old.yml .env-old ``` -> If you get any erros when updating please post on the [**upgrade discussion**](https://github.com/evertramos/basescript/discussions/5) (avoid creating new issues). +> If you get any erros when updating please post on the [**upgrade discussion**](https://github.com/StandardSoft/basescript/discussions/5) (avoid creating new issues).