Skip to content
This repository was archived by the owner on Jul 23, 2025. It is now read-only.

Commit b026518

Browse files
github-actions[bot]bketelsen
github-actions[bot]
and
bketelsen
authored
pull upstream changes (#49)
Co-authored-by: bketelsen <37492+bketelsen@users.noreply.github.com>
1 parent ec44402 commit b026518

8 files changed

Lines changed: 254 additions & 21 deletions

‎ct/alpine-adguard.sh‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#!/usr/bin/env bash
2+
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
3+
# Copyright (c) 2021-2025 community-scripts ORG
4+
# Author: MickLesk (CanbiZ)
5+
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
6+
# Source: https://adguardhome.com/
7+
8+
APP="Alpine-AdGuard"
9+
var_tags="${var_tags:-alpine;adblock}"
10+
var_cpu="${var_cpu:-1}"
11+
var_ram="${var_ram:-256}"
12+
var_disk="${var_disk:-1}"
13+
var_os="${var_os:-alpine}"
14+
var_version="${var_version:-3.21}"
15+
var_unprivileged="${var_unprivileged:-1}"
16+
17+
header_info "$APP"
18+
variables
19+
color
20+
catch_errors
21+
22+
function update_script() {
23+
header_info
24+
msg_info "Updating Alpine Packages"
25+
$STD apk update
26+
$STD apk upgrade
27+
msg_ok "Updated Alpine Packages"
28+
29+
msg_info "Updating AdGuard Home"
30+
$STD /opt/AdGuardHome/AdGuardHome --update
31+
msg_ok "Updated AdGuard Home"
32+
33+
msg_info "Restarting AdGuard Home"
34+
$STD rc-service adguardhome restart
35+
msg_ok "Restarted AdGuard Home"
36+
37+
exit 0
38+
}
39+
40+
start
41+
build_container
42+
description
43+
44+
msg_ok "Completed Successfully!\n"
45+
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
46+
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
47+
echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:3000${CL}"

‎ct/headers/alpine-adguard‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
___ __ _ ___ ________ __
2+
/ | / /___ (_)___ ___ / | ____/ / ____/_ ______ __________/ /
3+
/ /| | / / __ \/ / __ \/ _ \______/ /| |/ __ / / __/ / / / __ `/ ___/ __ /
4+
/ ___ |/ / /_/ / / / / / __/_____/ ___ / /_/ / /_/ / /_/ / /_/ / / / /_/ /
5+
/_/ |_/_/ .___/_/_/ /_/\___/ /_/ |_\__,_/\____/\__,_/\__,_/_/ \__,_/
6+
/_/

‎ct/headers/openziti-controller‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
_ __ _ __ ____
2+
____ ____ ___ ____ ____ (_) /_(_) _________ ____ / /__________ / / /__ _____
3+
/ __ \/ __ \/ _ \/ __ \/_ / / / __/ /_____/ ___/ __ \/ __ \/ __/ ___/ __ \/ / / _ \/ ___/
4+
/ /_/ / /_/ / __/ / / / / /_/ / /_/ /_____/ /__/ /_/ / / / / /_/ / / /_/ / / / __/ /
5+
\____/ .___/\___/_/ /_/ /___/_/\__/_/ \___/\____/_/ /_/\__/_/ \____/_/_/\___/_/
6+
/_/

‎ct/openziti-controller.sh‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
#!/usr/bin/env bash
2+
source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
3+
# Copyright (c) 2021-2025 community-scripts ORG
4+
# Author: emoscardini
5+
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
6+
# Source: https://github.com/openziti/ziti
7+
8+
APP="openziti-controller"
9+
var_tags="network;openziti-controller"
10+
var_cpu="2"
11+
var_ram="1024"
12+
var_disk="8"
13+
var_os="debian"
14+
var_version="12"
15+
var_unprivileged="1"
16+
17+
header_info "$APP"
18+
variables
19+
color
20+
catch_errors
21+
22+
function update_script() {
23+
header_info
24+
check_container_storage
25+
check_container_resources
26+
if [[ ! -d /opt/openziti ]]; then
27+
msg_error "No ${APP} Installation Found!"
28+
exit
29+
fi
30+
msg_info "Updating $APP LXC"
31+
$STD apt-get update
32+
$STD apt-get -y upgrade
33+
msg_ok "Updated $APP LXC"
34+
exit
35+
}
36+
37+
start
38+
build_container
39+
description
40+
41+
msg_ok "Completed Successfully!\n"
42+
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
43+
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
44+
echo -e "${TAB}${GATEWAY}${BGN}https://${IP}:<port>/zac${CL}"

‎install/alpine-adguard-install.sh‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
#!/usr/bin/env bash
2+
3+
# Copyright (c) 2021-2025 community-scripts ORG
4+
# Author: MickLesk (CanbiZ)
5+
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
6+
# Source: https://adguardhome.com/
7+
8+
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
9+
color
10+
verb_ip6
11+
catch_errors
12+
setting_up_container
13+
network_check
14+
update_os
15+
16+
msg_info "Downloading AdGuard Home"
17+
$STD curl -fsSL -o /tmp/AdGuardHome_linux_amd64.tar.gz \
18+
"https://github.com/AdguardTeam/AdGuardHome/releases/latest/download/AdGuardHome_linux_amd64.tar.gz"
19+
msg_ok "Downloaded AdGuard Home"
20+
21+
msg_info "Installing AdGuard Home"
22+
$STD tar -xzf /tmp/AdGuardHome_linux_amd64.tar.gz -C /opt
23+
$STD rm /tmp/AdGuardHome_linux_amd64.tar.gz
24+
msg_ok "Installed AdGuard Home"
25+
26+
msg_info "Creating AdGuard Home Service"
27+
cat <<EOF >/etc/init.d/adguardhome
28+
#!/sbin/openrc-run
29+
name="AdGuardHome"
30+
description="AdGuard Home Service"
31+
command="/opt/AdGuardHome/AdGuardHome"
32+
command_background="yes"
33+
pidfile="/run/adguardhome.pid"
34+
EOF
35+
$STD chmod +x /etc/init.d/adguardhome
36+
msg_ok "Created AdGuard Home Service"
37+
38+
msg_info "Enabling AdGuard Home Service"
39+
$STD rc-update add adguardhome default
40+
msg_ok "Enabled AdGuard Home Service"
41+
42+
msg_info "Starting AdGuard Home"
43+
$STD rc-service adguardhome start
44+
msg_ok "Started AdGuard Home"
45+
46+
motd_ssh
47+
customize
48+
49+
# Modified by surgeon https://github.com/bketelsen/surgeon

‎install/neo4j-install.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,22 @@ network_check
1515
update_os
1616

1717
msg_info "Installing Dependencies"
18-
$STD apt-get install -y gpg
18+
$STD apt-get install -y \
19+
gnupg2 \
20+
lsb-release
1921
msg_ok "Installed Dependencies"
2022

23+
msg_info "Setting up Adoptium Repository"
24+
mkdir -p /etc/apt/keyrings
25+
curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
26+
echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" >/etc/apt/sources.list.d/adoptium.list
27+
msg_ok "Set up Adoptium Repository"
28+
2129
msg_info "Installing Neo4j (patience)"
2230
curl -fsSL "https://debian.neo4j.com/neotechnology.gpg.key" | gpg --dearmor -o /etc/apt/keyrings/neotechnology.gpg
2331
echo 'deb [signed-by=/etc/apt/keyrings/neotechnology.gpg] https://debian.neo4j.com stable latest' >/etc/apt/sources.list.d/neo4j.list
2432
$STD apt-get update
33+
$STD apt-get install -y temurin-21-jre
2534
$STD apt-get install -y neo4j
2635
sed -i '/server.default_listen_address/s/^#//' /etc/neo4j/neo4j.conf
2736
systemctl enable -q --now neo4j

‎install/openziti-controller-install.sh‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#!/usr/bin/env bash
2+
3+
# Copyright (c) 2021-2025 community-scripts ORG
4+
# Author: emoscardini
5+
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
6+
# Source: https://github.com/openziti/ziti
7+
8+
source /dev/stdin <<< "$FUNCTIONS_FILE_PATH"
9+
color
10+
verb_ip6
11+
catch_errors
12+
setting_up_container
13+
network_check
14+
update_os
15+
16+
msg_info "Installing Dependencies"
17+
$STD apt-get install -y gpg
18+
msg_ok "Installed Dependencies"
19+
20+
msg_info "Installing openziti"
21+
mkdir -p --mode=0755 /usr/share/keyrings
22+
curl -fsSL https://get.openziti.io/tun/package-repos.gpg | gpg --dearmor -o /usr/share/keyrings/openziti.gpg
23+
echo "deb [signed-by=/usr/share/keyrings/openziti.gpg] https://packages.openziti.org/zitipax-openziti-deb-stable debian main" >/etc/apt/sources.list.d/openziti.list
24+
$STD apt-get update
25+
$STD apt-get install -y openziti-controller openziti-console
26+
msg_ok "Installed openziti"
27+
28+
read -r -p "Would you like to go through the auto configuration now? <y/N>" prompt
29+
if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
30+
IPADDRESS=$(hostname -I | awk '{print $1}')
31+
GEN_FQDN="controller.${IPADDRESS}.sslip.io"
32+
read -r -p "Please enter the controller FQDN [${GEN_FQDN}]: " ZITI_CTRL_ADVERTISED_ADDRESS
33+
ZITI_CTRL_ADVERTISED_ADDRESS=${ZITI_CTRL_ADVERTISED_ADDRESS:-$GEN_FQDN}
34+
read -r -p "Please enter the controller port [1280]: " ZITI_CTRL_ADVERTISED_PORT
35+
ZITI_CTRL_ADVERTISED_PORT=${ZITI_CTRL_ADVERTISED_PORT:-1280}
36+
read -r -p "Please enter the controller admin user [admin]: " ZITI_USER
37+
ZITI_USER=${ZITI_USER:-admin}
38+
GEN_PWD=$(head -c128 /dev/urandom | LC_ALL=C tr -dc 'A-Za-z0-9!@#$%^*_+~' | cut -c 1-12)
39+
read -r -p "Please enter the controller admin password [${GEN_PWD}]:" ZITI_PWD
40+
ZITI_PWD=${ZITI_PWD:-$GEN_PWD}
41+
CONFIG_FILE="/opt/openziti/etc/controller/bootstrap.env"
42+
sed -i "s|^ZITI_CTRL_ADVERTISED_ADDRESS=.*|ZITI_CTRL_ADVERTISED_ADDRESS='${ZITI_CTRL_ADVERTISED_ADDRESS}'|" "$CONFIG_FILE"
43+
sed -i "s|^ZITI_CTRL_ADVERTISED_PORT=.*|ZITI_CTRL_ADVERTISED_PORT='${ZITI_CTRL_ADVERTISED_PORT}'|" "$CONFIG_FILE"
44+
sed -i "s|^ZITI_USER=.*|ZITI_USER='${ZITI_USER}'|" "$CONFIG_FILE"
45+
sed -i "s|^ZITI_PWD=.*|ZITI_PWD='${ZITI_PWD}'|" "$CONFIG_FILE"
46+
env VERBOSE=0 bash /opt/openziti/etc/controller/bootstrap.bash
47+
msg_ok "Configuration Completed"
48+
systemctl enable -q --now ziti-controller
49+
else
50+
systemctl enable -q ziti-controller
51+
msg_error "Configration not provided; Please run /opt/openziti/etc/controller/bootstrap.bash to configure the controller and restart the container"
52+
fi
53+
54+
motd_ssh
55+
customize
56+
57+
msg_info "Cleaning up"
58+
$STD apt-get -y autoremove
59+
$STD apt-get -y autoclean
60+
msg_ok "Cleaned"
61+
62+
# Modified by surgeon https://github.com/bketelsen/surgeon

‎install/paymenter-install.sh‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,36 @@ $STD apt-get install -y \
1919
software-properties-common \
2020
apt-transport-https \
2121
ca-certificates \
22-
gnupg \
23-
php8.2 \
24-
php8.2-{common,cli,gd,mysql,mbstring,bcmath,xml,fpm,curl,zip} \
22+
gnupg2 \
2523
mariadb-server \
2624
nginx \
2725
redis-server
28-
$STD curl -fsSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
2926
msg_ok "Installed Dependencies"
3027

28+
msg_info "Adding PHP Repository"
29+
$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
30+
$STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
31+
$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
32+
$STD apt-get update
33+
msg_ok "Added PHP Repository"
34+
35+
msg_info "Installing PHP"
36+
$STD apt-get remove -y php8.2*
37+
$STD apt-get install -y \
38+
php8.3 \
39+
php8.3-{common,cli,gd,mysql,mbstring,bcmath,xml,curl,zip,intl,fpm,redis}
40+
msg_info "Installed PHP"
41+
42+
msg_info "Installing Composer"
43+
$STD curl -fsSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
44+
msg_ok "Installed Composer"
45+
3146
msg_info "Installing Paymenter"
3247
RELEASE=$(curl -fsSL https://api.github.com/repos/paymenter/paymenter/releases/latest | grep '"tag_name"' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
33-
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
48+
echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt
3449
mkdir -p /opt/paymenter
35-
cd /opt/paymenter
36-
curl -fsSL "https://github.com/paymenter/paymenter/releases/download/${RELEASE}/paymenter.tar.gz" -o $(basename "https://github.com/paymenter/paymenter/releases/download/${RELEASE}/paymenter.tar.gz")
50+
cd /opt/paymenter || exit
51+
curl -fsSL "https://github.com/paymenter/paymenter/releases/download/${RELEASE}/paymenter.tar.gz" -o paymenter.tar.gz
3752
$STD tar -xzvf paymenter.tar.gz
3853
chmod -R 755 storage/* bootstrap/cache/
3954
msg_ok "Installed Paymenter"
@@ -47,10 +62,10 @@ mysql -u root -e "CREATE DATABASE $DB_NAME;"
4762
mysql -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
4863
mysql -u root -e "GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'localhost' WITH GRANT OPTION;"
4964
{
50-
echo "Paymenter Database Credentials"
51-
echo "Database: $DB_NAME"
52-
echo "Username: $DB_USER"
53-
echo "Password: $DB_PASS"
65+
echo "Paymenter Database Credentials"
66+
echo "Database: $DB_NAME"
67+
echo "Username: $DB_USER"
68+
echo "Password: $DB_PASS"
5469
} >>~/paymenter_db.creds
5570
cp .env.example .env
5671
$STD composer install --no-dev --optimize-autoloader --no-interaction
@@ -63,13 +78,7 @@ $STD php artisan migrate --force --seed
6378
msg_ok "Set up database"
6479

6580
msg_info "Creating Admin User"
66-
$STD php artisan p:user:create <<EOF
67-
admin@paymenter.org
68-
paymenter
69-
admin
70-
paymenter
71-
0
72-
EOF
81+
$STD php artisan app:user:create paymenter admin admin@paymenter.org paymenter 1 -q
7382
msg_ok "Created Admin User"
7483

7584
msg_info "Configuring Nginx"
@@ -88,7 +97,7 @@ server {
8897
8998
location ~ \.php\$ {
9099
include snippets/fastcgi-php.conf;
91-
fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
100+
fastcgi_pass unix:/var/run/php/php8.3-fpm.sock;
92101
fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name;
93102
include fastcgi_params;
94103
}
@@ -125,7 +134,8 @@ RestartSec=5s
125134
[Install]
126135
WantedBy=multi-user.target
127136
EOF
128-
$STD systemctl enable --now paymenter
137+
systemctl enable --now paymenter
138+
systemctl enable --now redis-server
129139
msg_ok "Setup Service"
130140

131141
msg_info "Cleaning up"

0 commit comments

Comments
 (0)