diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 1d68d26..a64dd6e 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -22,6 +22,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: path-to-signatures: '.github/cla/signatures.json' - path-to-document: 'https://github.com/pelican-installer/pelican-installer/blob/Production/CLA.md' - branch: 'Production' + path-to-document: 'https://github.com/pelican-installer/pelican-installer/blob/Development/CLA.md' + branch: 'Development' allowlist: dependabot[bot], renovate[bot], Zinidia diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 85a1f78..f3169ee 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -2,9 +2,9 @@ name: Shellcheck on: push: - branches: ["Production"] + branches: ["Development"] pull_request: - branches: ["Production"] + branches: ["Development"] jobs: shellcheck: diff --git a/README.md b/README.md index a2b0099..66ad018 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Learn more about [Pelican's Project](https://pelican.dev/) here. This script is To use the installation scripts, simply run this command as root. The script will ask you whether you would like to install just the panel, just Wings or both. ```bash -bash <(curl -Ss https://raw.githubusercontent.com/Zinidia/Pelinstaller/Production/install.sh || wget -O - https://raw.githubusercontent.com/Zinidia/Pelinstaller/Production/install.sh) auto +bash <(curl -Ss https://raw.githubusercontent.com/Zinidia/Pelinstaller/Development/install.sh || wget -O - https://raw.githubusercontent.com/Zinidia/Pelinstaller/Development/install.sh) auto ``` _Note: On some systems, it's required to be already logged in as root before executing the one-line command (where `sudo` is in front of the command does not work)._ @@ -68,7 +68,7 @@ _\* Indicates an operating system and release that previously was supported by t The installation scripts can install and configure a firewall for you. The script will ask whether you want this or not. It is highly recommended to opt-in for the automatic firewall setup. -## Production & Ops +## Development & Ops ### Creating a release diff --git a/install.sh b/install.sh index 99f4cd3..adf896d 100755 --- a/install.sh +++ b/install.sh @@ -22,14 +22,14 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # # # ###################################################################################### -export GITHUB_SOURCE="Production" +export GITHUB_SOURCE="Development" export SCRIPT_RELEASE="canary" export GITHUB_BASE_URL="https://raw.githubusercontent.com/pelican-installer/pelican-installer" @@ -84,7 +84,7 @@ source /tmp/lib.sh execute() { echo -e "\n\n* pelican-installer $(date) \n\n" >>$LOG_PATH - [[ "$1" == *"canary"* ]] && export GITHUB_SOURCE="Production" && export SCRIPT_RELEASE="canary" + [[ "$1" == *"canary"* ]] && export GITHUB_SOURCE="Development" && export SCRIPT_RELEASE="canary" update_lib_source run_ui "${1//_canary/}" |& tee -a $LOG_PATH @@ -110,7 +110,7 @@ while [ "$done" == false ]; do "Install Both Standard [0] and [1] on the same machine (wings script runs after panel)" "Both Test Environment - Full automation and zero prompts, HTTP-only" - "Attempt to uninstall panel or wings with (the versions that lives in Production, may be broken!)" + "Attempt to uninstall panel or wings with (the versions that lives in Development, may be broken!)" ) actions=( diff --git a/installers/basic.sh b/installers/basic.sh index ff0e091..86a5c15 100644 --- a/installers/basic.sh +++ b/installers/basic.sh @@ -25,7 +25,7 @@ export SUPPORTED=false # Download URLs export PANEL_DL_URL="https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz" export WINGS_DL_URL="https://github.com/pelican-dev/wings/releases/latest/download/wings_linux_" -export GIT_REPO_URL="https://raw.githubusercontent.com/pelican-installer/pelican-installer/Production" +export GIT_REPO_URL="https://raw.githubusercontent.com/pelican-installer/pelican-installer/Development" # Colors COLOR_YELLOW='\033[1;33m' @@ -547,10 +547,10 @@ install_composer_deps create_db_user "pelican" "$MYSQL_PASSWORD" create_db "panel" "pelican" configure_env -set_folder_permissions insert_cronjob pteroq_systemd configure_nginx +set_folder_permissions install_firewall firewall_ports "22 80 443 8080 2022" output "Installing Pelican Wings.." diff --git a/installers/panel.sh b/installers/panel.sh index b95f348..0b31428 100755 --- a/installers/panel.sh +++ b/installers/panel.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # @@ -411,10 +411,10 @@ perform_install() { create_db_user "$MYSQL_USER" "$MYSQL_PASSWORD" create_db "$MYSQL_DB" "$MYSQL_USER" configure - set_folder_permissions insert_cronjob install_pteroq configure_nginx + set_folder_permissions [ "$CONFIGURE_LETSENCRYPT" == true ] && letsencrypt return 0 diff --git a/installers/phpmyadmin.sh b/installers/phpmyadmin.sh index 69e1a3b..c1a6caf 100644 --- a/installers/phpmyadmin.sh +++ b/installers/phpmyadmin.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/installers/uninstall.sh b/installers/uninstall.sh index 95ed707..0b47eb2 100644 --- a/installers/uninstall.sh +++ b/installers/uninstall.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/installers/wings.sh b/installers/wings.sh index 311e917..a035d7d 100755 --- a/installers/wings.sh +++ b/installers/wings.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/lib/lib.sh b/lib/lib.sh index 954c86f..8e82f06 100755 --- a/lib/lib.sh +++ b/lib/lib.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # @@ -32,7 +32,7 @@ set -e # ------------------ Variables ----------------- # # Versioning -export GITHUB_SOURCE=${GITHUB_SOURCE:-Production} +export GITHUB_SOURCE=${GITHUB_SOURCE:-Development} export SCRIPT_RELEASE=${SCRIPT_RELEASE:-canary} # Pelican versions diff --git a/lib/verify-fqdn.sh b/lib/verify-fqdn.sh index 776322c..4d7cd2b 100755 --- a/lib/verify-fqdn.sh +++ b/lib/verify-fqdn.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/ui/basic.sh b/ui/basic.sh index ee6b255..c4e2b5e 100644 --- a/ui/basic.sh +++ b/ui/basic.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/ui/panel.sh b/ui/panel.sh index b4d3033..ba3c31e 100755 --- a/ui/panel.sh +++ b/ui/panel.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/ui/uninstall.sh b/ui/uninstall.sh index 906a21d..b90f3dc 100644 --- a/ui/uninstall.sh +++ b/ui/uninstall.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer # diff --git a/ui/wings.sh b/ui/wings.sh index 9c68ed2..d0b3853 100755 --- a/ui/wings.sh +++ b/ui/wings.sh @@ -22,7 +22,7 @@ set -e # You should have received a copy of the GNU General Public License # # along with this program. If not, see . # # # -# https://github.com/pelican-installer/pelican-installer/blob/Production/LICENSE.md # +# https://github.com/pelican-installer/pelican-installer/blob/Development/LICENSE.md # # # # This script is not associated with the official Pelican Project. # # https://github.com/pelican-installer/pelican-installer #