Merge 9673cb7b7a into 7176eaa99d

Update CHANGELOG.md
Add new LXC: Wallos (#3956 )
2024-10-23 20:19:10 +02:00 · 2024-10-23 14:16:41 -04:00 · 2024-10-23 13:19:53 -04:00 · 2024-10-22 22:47:47 +02:00 · 2024-10-22 22:45:25 +02:00 · 2024-10-22 22:04:36 +02:00
6 changed files with 210 additions and 38 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -13,6 +13,13 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 > [!NOTE]
 All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.

+## 2024-10-23
+
+### Changed
+
+- **Wallos LXC** [(View Source)](https://github.com/tteck/Proxmox/blob/main/install/wallos-install.sh)
+  - NEW Script
+
 ## 2024-10-19

 ### Changed
--- a/ct/wallos.sh
+++ b/ct/wallos.sh
@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func)
+# Copyright (c) 2021-2024 tteck
+# Author: tteck
+# Co-Author: MickLesk (Canbiz)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+
+function header_info {
+clear
+cat <<"EOF"
+ _       __      ____          
+| |     / /___ _/ / /___  _____
+| | /| / / __ `/ / / __ \/ ___/
+| |/ |/ / /_/ / / / /_/ (__  ) 
+|__/|__/\__,_/_/_/\____/____/  
+                               
+EOF
+}
+header_info
+echo -e "Loading..."
+APP="Wallos"
+var_disk="5"
+var_cpu="1"
+var_ram="1024"
+var_os="debian"
+var_version="12"
+variables
+color
+catch_errors
+
+function default_settings() {
+  CT_TYPE="1"
+  PW=""
+  CT_ID=$NEXTID
+  HN=$NSAPP
+  DISK_SIZE="$var_disk"
+  CORE_COUNT="$var_cpu"
+  RAM_SIZE="$var_ram"
+  BRG="vmbr0"
+  NET="dhcp"
+  GATE=""
+  APT_CACHER=""
+  APT_CACHER_IP=""
+  DISABLEIP6="no"
+  MTU=""
+  SD=""
+  NS=""
+  MAC=""
+  VLAN=""
+  SSH="no"
+  VERB="no"
+  echo_default
+}
+
+function update_script() {
+header_info
+if [[ ! -d /opt/wallos ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+if (( $(df /boot | awk 'NR==2{gsub("%","",$5); print $5}') > 80 )); then
+  read -r -p "Warning: Storage is dangerously low, continue anyway? <y/N> " prompt
+  [[ ${prompt,,} =~ ^(y|yes)$ ]] || exit
+fi
+RELEASE=$(curl -s https://api.github.com/repos/ellite/Wallos/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+  msg_info "Updating ${APP} to ${RELEASE}"
+  cd /opt
+  wget -q "https://github.com/ellite/Wallos/archive/refs/tags/v${RELEASE}.zip"
+  mv /opt/wallos/db/wallos.db /opt/wallos.db
+  unzip -q v${RELEASE}.zip
+  mv Wallos-${RELEASE} /opt/wallos
+  rm -rf /opt/wallos/db/wallos.empty.db
+  mv /opt/wallos.db /opt/wallos/db/wallos.db
+  chown -R www-data:www-data /opt/wallos
+  chmod -R 755 /opt/wallos
+  curl http://localhost/endpoints/db/migrate.php &>/dev/null
+  echo "${RELEASE}" >/opt/${APP}_version.txt
+  msg_ok "Updated ${APP}"
+
+  msg_info "Reload Apache2"
+  systemctl reload apache2
+  msg_ok "Apache2 Reloaded"
+
+  msg_info "Cleaning Up"
+  rm -R /opt/v${RELEASE}.zip 
+  msg_ok "Cleaned"
+  msg_ok "Updated Successfully"
+else
+  msg_ok "No update required. ${APP} is already at ${RELEASE}"
+fi
+exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${APP} should be reachable by going to the following URL.
+         ${BL}http://${IP} ${CL} \n"
--- a/ct/zoraxy.sh
+++ b/ct/zoraxy.sh
@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/build.func)
+source <(curl -s https://raw.githubusercontent.com/dsiebel/Proxmox/zoraxy-prebuilt/misc/build.func)
 # Copyright (c) 2021-2024 tteck
 # Author: tteck (tteckster)
 # License: MIT
@ -20,7 +20,7 @@ header_info
 echo -e "Loading..."
 APP="Zoraxy"
 var_disk="6"
-var_cpu="4"
+var_cpu="2"
 var_ram="2048"
 var_os="debian"
 var_version="12"
@ -54,20 +54,19 @@ function default_settings() {

 function update_script() {
 header_info
-if [[ ! -d /opt/zoraxy/src ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
-whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "SET RESOURCES" "Please set the resources in your ${APP} LXC to ${var_cpu}vCPU and ${var_ram}RAM for the build process before continuing" 10 75
-msg_info "Updating $APP"
-systemctl stop zoraxy
-cd /opt/zoraxy/src
-systemctl stop zoraxy
-if git pull | grep -q 'Already up to date.'; then
-  msg_ok "Already up to date. No update required."
+if [[ ! -f /etc/systemd/system/zoraxy.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
+RELEASE="$(curl -s https://api.github.com/repos/tobychui/zoraxy/releases | grep -oP '"tag_name":\s*"\K[\d.]+?(?=")' | sort -V | tail -n1)"
+msg_info "Updating ${APP} LXC to ${RELEASE}"
+if [[ "${RELEASE}" != "$(cat "/opt/${APP}_version.txt")" ]] || [[ ! -f "/opt/${APP}_version.txt" ]]; then
+  wget -q "https://github.com/tobychui/zoraxy/releases/download/${RELEASE}/zoraxy_linux_amd64"
+  install zoraxy_linux_amd64 /usr/bin/zoraxy
+  rm zoraxy_linux_amd64
+  echo "${RELEASE}" > "/opt/${APP}_version.txt"
+  systemctl restart traefik.service
+  msg_ok "Updated ${APP} LXC"
 else
-  go mod tidy
-  go build
-  msg_ok "Updated $APP"
+  msg_ok "No update required. ${APP} is already at ${RELEASE}"
 fi
-systemctl start zoraxy
 exit
 }

@ -75,9 +74,6 @@ start
 build_container
 description

-msg_info "Setting Container to Normal Resources"
-pct set $CTID -cores 2
-msg_ok "Set Container to Normal Resources"
 msg_ok "Completed Successfully!\n"
 echo -e "${APP} should be reachable by going to the following URL.
         ${BL}http://${IP}:8000${CL} \n"
--- a/install/wallos-install.sh
+++ b/install/wallos-install.sh
@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2024 tteck
+# Author: tteck
+# Co-Author: MickLesk (Canbiz)
+# License: MIT
+# https://github.com/tteck/Proxmox/raw/main/LICENSE
+# Source: https://github.com/ellite/wallos
+
+source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y \
+  curl \
+  sudo \
+  mc \
+  apache2 \
+  libapache2-mod-php \
+  php8.2-{mbstring,gd,curl,intl,imagick,bz2,sqlite3,zip,xml} 
+msg_ok "Installed Dependencies"
+
+msg_info "Installing Wallos (Patience)"
+cd /opt
+RELEASE=$(curl -s https://api.github.com/repos/ellite/Wallos/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+wget -q "https://github.com/ellite/Wallos/archive/refs/tags/v${RELEASE}.zip"
+unzip -q v${RELEASE}.zip
+mv Wallos-${RELEASE} /opt/wallos
+cd /opt/wallos
+mv /opt/wallos/db/wallos.empty.db /opt/wallos/db/wallos.db
+chown -R www-data:www-data /opt/wallos
+chmod -R 755 /opt/wallos
+echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
+
+cat <<EOF >/etc/apache2/sites-available/wallos.conf
+<VirtualHost *:80>
+    ServerAdmin webmaster@localhost
+    DocumentRoot /opt/wallos
+
+    <Directory /opt/wallos>
+        Options Indexes FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
+
+    ErrorLog \${APACHE_LOG_DIR}/wallos_error.log
+    CustomLog \${APACHE_LOG_DIR}/wallos_access.log combined
+</VirtualHost>
+EOF
+$STD a2ensite wallos.conf
+$STD a2dissite 000-default.conf  
+$STD systemctl reload apache2
+$STD curl http://localhost/endpoints/db/migrate.php
+msg_ok "Installed Wallos"
+
+msg_info "Setting up Crontabs" 
+cat <<EOF > /opt/wallos.cron
+0 1 * * * php /opt/wallos/endpoints/cronjobs/updatenextpayment.php >> /var/log/cron/updatenextpayment.log 2>&1
+0 2 * * * php /opt/wallos/endpoints/cronjobs/updateexchange.php >> /var/log/cron/updateexchange.log 2>&1
+0 8 * * * php /opt/wallos/endpoints/cronjobs/sendcancellationnotifications.php >> /var/log/cron/sendcancellationnotifications.log 2>&1
+0 9 * * * php /opt/wallos/endpoints/cronjobs/sendnotifications.php >> /var/log/cron/sendnotifications.log 2>&1
+*/2 * * * * php /opt/wallos/endpoints/cronjobs/sendverificationemails.php >> /var/log/cron/sendverificationemail.log 2>&1
+*/2 * * * * php /opt/wallos/endpoints/cronjobs/sendresetpasswordemails.php >> /var/log/cron/sendresetpasswordemails.log 2>&1
+0 */6 * * * php /opt/wallos/endpoints/cronjobs/checkforupdates.php >> /var/log/cron/checkforupdates.log 2>&1
+EOF
+crontab /opt/wallos.cron
+msg_ok "Crontabs setup"
+
+motd_ssh
+customize
+
+msg_info "Cleaning up"
+rm -rf /opt/v${RELEASE}.zip
+$STD apt-get -y autoremove
+$STD apt-get -y autoclean
+msg_ok "Cleaned"
--- a/install/zoraxy-install.sh
+++ b/install/zoraxy-install.sh
@ -20,20 +20,11 @@ $STD apt-get install -y mc
 $STD apt-get install -y git
 msg_ok "Installed Dependencies"

-msg_info "Installing Golang"
-set +o pipefail
-RELEASE=$(curl -s https://go.dev/dl/ | grep -o "go.*\linux-amd64.tar.gz" | head -n 1)
-wget -q https://golang.org/dl/$RELEASE
-$STD tar -xzf $RELEASE -C /usr/local
-$STD ln -s /usr/local/go/bin/go /usr/local/bin/go
-set -o pipefail
-msg_ok "Installed Golang"
-
-msg_info "Installing Zoraxy (Patience)"
-$STD git clone https://github.com/tobychui/zoraxy /opt/zoraxy
-cd /opt/zoraxy/src
-$STD go mod tidy
-$STD go build
+RELEASE="$(curl -s https://api.github.com/repos/tobychui/zoraxy/releases | grep -oP '"tag_name":\s*"\K[\d.]+?(?=")' | sort -V | tail -n1)"
+msg_info "Installing Zoraxy v${RELEASE}"
+wget -q "https://github.com/tobychui/zoraxy/releases/download/${RELEASE}/zoraxy_linux_amd64"
+install zoraxy_linux_amd64 /usr/bin/zoraxy
+echo "${RELEASE}" > "/opt/${APPLICATION}_version.txt"
 msg_ok "Installed Zoraxy"

 msg_info "Creating Service"
@ -43,8 +34,7 @@ Description=General purpose request proxy and forwarding tool
 After=syslog.target network-online.target

 [Service]
-ExecStart=/opt/zoraxy/src/./zoraxy
-WorkingDirectory=/opt/zoraxy/src/
+ExecStart=/usr/bin/zoraxy
 Restart=always

 [Install]
@ -57,7 +47,6 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-rm -rf $RELEASE
 $STD apt-get -y autoremove
 $STD apt-get -y autoclean
 msg_ok "Cleaned"
--- a/misc/build.func
+++ b/misc/build.func
@ -537,9 +537,9 @@ build_container() {
  TEMP_DIR=$(mktemp -d)
  pushd $TEMP_DIR >/dev/null
  if [ "$var_os" == "alpine" ]; then
-    export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/alpine-install.func)"
+    export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/dsiebel/Proxmox/zoraxy-prebuilt/misc/alpine-install.func)"
  else
-    export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)"
+    export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/dsiebel/Proxmox/zoraxy-prebuilt/misc/install.func)"
  fi
  export CACHER="$APT_CACHER"
  export CACHER_IP="$APT_CACHER_IP"
@ -569,7 +569,7 @@ build_container() {
    $PW
  "
  # This executes create_lxc.sh and creates the container and .conf file
-  bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
+  bash -c "$(wget -qLO - https://raw.githubusercontent.com/dsiebel/Proxmox/zoraxy-prebuilt/ct/create_lxc.sh)" || exit

  LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
  if [ "$CT_TYPE" == "0" ]; then
@ -633,7 +633,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
 EOF'
    pct exec "$CTID" -- ash -c "apk add bash >/dev/null"
  fi
-  lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/install/$var_install.sh)" || exit
+  lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/dsiebel/Proxmox/zoraxy-prebuilt/install/$var_install.sh)" || exit

 }
Author	SHA1	Message	Date
Dominik Siebel	4b1bbdee52	Merge `9673cb7b7a` into `7176eaa99d`	2024-10-23 20:19:10 +02:00
tteckster	7176eaa99d	Update CHANGELOG.md	2024-10-23 14:16:41 -04:00
CanbiZ	2184eab0c5	Add new LXC: Wallos (#3956 )	2024-10-23 13:19:53 -04:00
Dominik Siebel	9673cb7b7a	fix: remove macos gnu grep	2024-10-22 22:47:47 +02:00
Dominik Siebel	ddccdff67e	to-be-reverted: temporarily change origin URLs for testing	2024-10-22 22:45:25 +02:00
Dominik Siebel	0d1365b2d9	fix(zoraxy): install stable release instead of building from main branch	2024-10-22 22:04:36 +02:00