zepheris/proxmox-reverseProxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #61 from ej52/develop

Browse Source 
fix: updates to alpine and ubuntu scripts
This commit is contained in:
Elton Renda
2022-01-16 16:40:03 +02:00
committed by GitHub
parent 8f8dbbe5f9 67cf40d623
commit 73f1b52a5e
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lxc/nginx-proxy-manager/install/alpine.sh
View File

@ -8,7 +8,7 @@ TEMPERR="$TEMPDIR/tmperr"
LASTCMD="" LASTCMD=""
WGETOPT="-t 1 -T 15 -q" WGETOPT="-t 1 -T 15 -q"
DEVDEPS="npm g++ make gcc git python3-dev musl-dev libffi-dev openssl-dev" DEVDEPS="npm g++ make gcc git python3-dev musl-dev libffi-dev openssl-dev"
NPMURL="https://github.com/jc21/nginx-proxy-manager" NPMURL="https://github.com/NginxProxyManager/nginx-proxy-manager"
cd $TEMPDIR cd $TEMPDIR
touch $TEMPLOG touch $TEMPLOG
@ -67,7 +67,6 @@ fi
log "Checking for latest openresty repository" log "Checking for latest openresty repository"
. /etc/os-release . /etc/os-release
_alpine_version=${VERSION_ID%.*} _alpine_version=${VERSION_ID%.*}
_npm_url="https://github.com/jc21/nginx-proxy-manager"
# add openresty public key # add openresty public key
if [ ! -f /etc/apk/keys/admin@openresty.com-5ea678a6.rsa.pub ]; then if [ ! -f /etc/apk/keys/admin@openresty.com-5ea678a6.rsa.pub ]; then
runcmd 'wget $WGETOPT -P /etc/apk/keys/ http://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub' runcmd 'wget $WGETOPT -P /etc/apk/keys/ http://openresty.org/package/admin@openresty.com-5ea678a6.rsa.pub'
@ -95,24 +94,25 @@ runcmd 'apk add python3 openresty nodejs yarn openssl apache2-utils logrotate $D
# Setup python env and PIP # Setup python env and PIP
log "Setting up python" log "Setting up python"
python3 -m venv /opt/certbot/ python3 -m venv /opt/certbot/
runcmd 'wget $WGETOPT -c https://bootstrap.pypa.io/get-pip.py -O - | python3' runcmd python3 -m ensurepip --upgrade
# Install certbot and python dependancies # Install certbot and python dependancies
runcmd pip install --no-cache-dir -U cryptography==3.3.2 runcmd pip3 install --no-cache-dir -U cryptography==3.3.2
runcmd pip install --no-cache-dir cffi certbot runcmd pip3 install --no-cache-dir cffi certbot
log "Checking for latest NPM release" log "Checking for latest NPM release"
# Get latest version information for nginx-proxy-manager # Get latest version information for nginx-proxy-manager
runcmd 'wget $WGETOPT -O ./_latest_release $_npm_url/releases/latest' runcmd 'wget $WGETOPT -O ./_latest_release $NPMURL/releases/latest'
_latest_version=$(basename $(cat ./_latest_release | grep -wo "jc21/.*.tar.gz") .tar.gz | cut -d'v' -f2) _latest_version=$(basename $(cat ./_latest_release | grep -wo "NginxProxyManager/.*.tar.gz") .tar.gz | cut -d'v' -f2)
# Download nginx-proxy-manager source # Download nginx-proxy-manager source
log "Downloading NPM v$_latest_version" log "Downloading NPM v$_latest_version"
runcmd 'wget $WGETOPT -c $_npm_url/archive/v$_latest_version.tar.gz -O - | tar -xz' runcmd 'wget $WGETOPT -c $NPMURL/archive/v$_latest_version.tar.gz -O - | tar -xz'
cd ./nginx-proxy-manager-$_latest_version cd ./nginx-proxy-manager-$_latest_version
log "Setting up enviroment" log "Setting up enviroment"
# Crate required symbolic links # Crate required symbolic links
ln -sf /usr/bin/python3 /usr/bin/python ln -sf /usr/bin/python3 /usr/bin/python
ln -sf /usr/bin/pip3 /usr/bin/pip
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

6
lxc/nginx-proxy-manager/install/ubuntu.sh
View File

@ -8,7 +8,7 @@ TEMPERR="$TEMPDIR/tmperr"
LASTCMD="" LASTCMD=""
WGETOPT="-t 1 -T 15 -q" WGETOPT="-t 1 -T 15 -q"
DEVDEPS="git build-essential libffi-dev libssl-dev python3-dev" DEVDEPS="git build-essential libffi-dev libssl-dev python3-dev"
NPMURL="https://github.com/jc21/nginx-proxy-manager" NPMURL="https://github.com/NginxProxyManager/nginx-proxy-manager"
cd $TEMPDIR cd $TEMPDIR
touch $TEMPLOG touch $TEMPLOG
@ -68,7 +68,7 @@ fi
log "Installing dependencies" log "Installing dependencies"
runcmd apt-get update runcmd apt-get update
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
runcmd 'apt-get install -y --no-install-recommends $DEVDEPS gnupg openssl ca-certificates apache2-utils logrotate' runcmd 'sudo apt-get install -y --no-install-recommends $DEVDEPS gnupg openssl ca-certificates apache2-utils logrotate'
# Install Python # Install Python
log "Installing python" log "Installing python"
@ -100,7 +100,7 @@ runcmd npm install --global yarn
# Get latest version information for nginx-proxy-manager # Get latest version information for nginx-proxy-manager
log "Checking for latest NPM release" log "Checking for latest NPM release"
runcmd 'wget $WGETOPT -O ./_latest_release $NPMURL/releases/latest' runcmd 'wget $WGETOPT -O ./_latest_release $NPMURL/releases/latest'
_latest_version=$(basename $(cat ./_latest_release | grep -wo "jc21/.*.tar.gz") .tar.gz | cut -d'v' -f2) _latest_version=$(basename $(cat ./_latest_release | grep -wo "NginxProxyManager/.*.tar.gz") .tar.gz | cut -d'v' -f2)
# Download nginx-proxy-manager source # Download nginx-proxy-manager source
log "Downloading NPM v$_latest_version" log "Downloading NPM v$_latest_version"