nick
/
Proxmox_Scripts
mirror of https://github.com/tteck/Proxmox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: nick:b39bb439bf674bfb75ec6e44dd5b540f09beaa60
Branches Tags
nick:main
nick:gh-pages
..
compare: nick:b2124be08f82169cc2902ba047f2544fb76d62af
Branches Tags
nick:gh-pages
nick:main

No commits in common. "b39bb439bf674bfb75ec6e44dd5b540f09beaa60" and "b2124be08f82169cc2902ba047f2544fb76d62af" have entirely different histories.
b39bb439bf ... b2124be08f

2 changed files with 15 additions and 26 deletions
Show Stats Expand all files Collapse all files

20
ct/nginxproxymanager.sh
View File

@ -74,18 +74,18 @@ function update_script() {
/var/cache/nginx &>/dev/null /var/cache/nginx &>/dev/null
msg_ok "Cleaned Old Files" msg_ok "Cleaned Old Files"
msg_info "Downloading NPM v2.10.2" msg_info "Downloading NPM v2.9.22"
wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.10.2 -O - | tar -xz &>/dev/null wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz &>/dev/null
cd nginx-proxy-manager-2.10.2 cd nginx-proxy-manager-2.9.22
msg_ok "Downloaded NPM v2.10.2" msg_ok "Downloaded NPM v2.9.22"
msg_info "Setting up Enviroment" msg_info "Setting up Enviroment"
ln -sf /usr/bin/python3 /usr/bin/python ln -sf /usr/bin/python3 /usr/bin/python
ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /usr/bin/certbot /opt/certbot/bin/certbot
ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
ln -sf /usr/local/openresty/nginx/ /etc/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx
sed -i "s+0.0.0+2.10.2+g" backend/package.json sed -i "s+0.0.0+2.9.22+g" backend/package.json
sed -i "s+0.0.0+2.10.2+g" frontend/package.json sed -i "s+0.0.0+2.9.22+g" frontend/package.json
sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
for NGINX_CONF in $NGINX_CONFS; do for NGINX_CONF in $NGINX_CONFS; do
@ -124,11 +124,6 @@ function update_script() {
mkdir -p /app/global /app/frontend/images mkdir -p /app/global /app/frontend/images
cp -r backend/* /app cp -r backend/* /app
cp -r global/* /app/global cp -r global/* /app/global
wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-noarch.tar.xz"
wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-x86_64.tar.xz"
tar -C / -Jxpf s6-overlay-noarch.tar.xz
tar -C / -Jxpf s6-overlay-x86_64.tar.xz
python3 -m pip install --no-cache-dir certbot-dns-cloudflare &>/dev/null
msg_ok "Setup Enviroment" msg_ok "Setup Enviroment"
msg_info "Building Frontend" msg_info "Building Frontend"
@ -163,14 +158,13 @@ EOF
msg_ok "Initialized Backend" msg_ok "Initialized Backend"
msg_info "Starting Services" msg_info "Starting Services"
sed -i -e 's/^pid/#pid/' -e 's/npmuser/root/' /usr/local/openresty/nginx/conf/nginx.conf
systemctl enable npm &>/dev/null systemctl enable npm &>/dev/null
systemctl start openresty systemctl start openresty
systemctl start npm systemctl start npm
msg_ok "Started Services" msg_ok "Started Services"
msg_info "Cleaning up" msg_info "Cleaning up"
rm -rf ~/nginx-proxy-manager-* s6-overlay-noarch.tar.xz s6-overlay-x86_64.tar.xz rm -rf ~/nginx-proxy-manager-*
msg_ok "Cleaned" msg_ok "Cleaned"
msg_ok "Update Successfull" msg_ok "Update Successfull"

21
install/nginxproxymanager-install.sh
View File

@ -40,7 +40,7 @@ $STD python3 -m venv /opt/certbot/
if [ "$(getconf LONG_BIT)" = "32" ]; then if [ "$(getconf LONG_BIT)" = "32" ]; then
$STD python3 -m pip install --no-cache-dir -U cryptography==3.3.2 $STD python3 -m pip install --no-cache-dir -U cryptography==3.3.2
fi fi
$STD python3 -m pip install --no-cache-dir cffi certbot certbot-dns-cloudflare $STD python3 -m pip install --no-cache-dir cffi certbot
msg_ok "Installed Python" msg_ok "Installed Python"
msg_info "Installing Openresty" msg_info "Installing Openresty"
@ -66,10 +66,10 @@ RELEASE=$(curl -s https://api.github.com/repos/NginxProxyManager/nginx-proxy-man
grep "tag_name" | grep "tag_name" |
awk '{print substr($2, 3, length($2)-4) }') awk '{print substr($2, 3, length($2)-4) }')
msg_info "Downloading Nginx Proxy Manager v2.10.2" msg_info "Downloading Nginx Proxy Manager v2.9.22"
wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.10.2 -O - | tar -xz wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.22 -O - | tar -xz
cd ./nginx-proxy-manager-2.10.2 cd ./nginx-proxy-manager-2.9.22
msg_ok "Downloaded Nginx Proxy Manager v2.10.2" msg_ok "Downloaded Nginx Proxy Manager v2.9.22"
msg_info "Setting up Enviroment" msg_info "Setting up Enviroment"
ln -sf /usr/bin/python3 /usr/bin/python ln -sf /usr/bin/python3 /usr/bin/python
@ -77,8 +77,8 @@ ln -sf /usr/bin/certbot /opt/certbot/bin/certbot
ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx
ln -sf /usr/local/openresty/nginx/ /etc/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx
sed -i "s+0.0.0+2.10.2+g" backend/package.json sed -i "s+0.0.0+2.9.22+g" backend/package.json
sed -i "s+0.0.0+2.10.2+g" frontend/package.json sed -i "s+0.0.0+2.9.22+g" frontend/package.json
sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf") NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
@ -124,10 +124,6 @@ fi
mkdir -p /app/global /app/frontend/images mkdir -p /app/global /app/frontend/images
cp -r backend/* /app cp -r backend/* /app
cp -r global/* /app/global cp -r global/* /app/global
wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-noarch.tar.xz"
wget -q "https://github.com/just-containers/s6-overlay/releases/download/v3.1.4.1/s6-overlay-x86_64.tar.xz"
tar -C / -Jxpf s6-overlay-noarch.tar.xz
tar -C / -Jxpf s6-overlay-x86_64.tar.xz
msg_ok "Set up Enviroment" msg_ok "Set up Enviroment"
msg_info "Building Frontend" msg_info "Building Frontend"
@ -185,13 +181,12 @@ motd_ssh
root root
msg_info "Starting Services" msg_info "Starting Services"
sed -i -e 's/^pid/#pid/' -e 's/npmuser/root/' /usr/local/openresty/nginx/conf/nginx.conf
$STD systemctl enable --now openresty $STD systemctl enable --now openresty
$STD systemctl enable --now npm $STD systemctl enable --now npm
msg_ok "Started Services" msg_ok "Started Services"
msg_info "Cleaning up" msg_info "Cleaning up"
rm -rf ../nginx-proxy-manager-* s6-overlay-noarch.tar.xz s6-overlay-x86_64.tar.xz rm -rf ../nginx-proxy-manager-*
$STD apt-get autoremove $STD apt-get autoremove
$STD apt-get autoclean $STD apt-get autoclean
msg_ok "Cleaned" msg_ok "Cleaned"