Skip to content

Commit

Permalink
Temp
Browse files Browse the repository at this point in the history
  • Loading branch information
Zinidia authored Sep 16, 2024
1 parent 0b2745e commit 723289b
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Shellcheck

on:
push:
branches: ["Production"]
branches: ["Development"]
pull_request:
branches: ["Production"]
branches: ["Development"]

jobs:
shellcheck:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)._
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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"

Expand Down Expand Up @@ -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

Expand All @@ -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=(
Expand Down
4 changes: 2 additions & 2 deletions installers/basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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.."
Expand Down
4 changes: 2 additions & 2 deletions installers/panel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion installers/phpmyadmin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion installers/uninstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion installers/wings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
4 changes: 2 additions & 2 deletions lib/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/verify-fqdn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion ui/basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion ui/panel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion ui/uninstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down
2 changes: 1 addition & 1 deletion ui/wings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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://www.gnu.org/licenses/>. #
# #
# 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 #
Expand Down

0 comments on commit 723289b

Please sign in to comment.