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

Merge pull request #46 from ej52/develop

Browse Source 
fix: ubuntu fixes
This commit is contained in:
Elton Renda
2021-08-12 19:56:42 +02:00
committed by GitHub
parent 840d4113a0 f5c5176470
commit 8f8dbbe5f9
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,8 +118,8 @@ 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
# Update NPM version in package.json files # Update NPM version in package.json files
sed -i "s+0.0.0+#$_latest_version+g" backend/package.json sed -i "s+0.0.0+$_latest_version+g" backend/package.json
sed -i "s+0.0.0+#$_latest_version+g" frontend/package.json sed -i "s+0.0.0+$_latest_version+g" frontend/package.json
# Fix nginx config files for use with openresty defaults # Fix nginx config files for use with openresty defaults
sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf

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

@ -7,7 +7,7 @@ TEMPLOG="$TEMPDIR/tmplog"
TEMPERR="$TEMPDIR/tmperr" TEMPERR="$TEMPDIR/tmperr"
LASTCMD="" LASTCMD=""
WGETOPT="-t 1 -T 15 -q" WGETOPT="-t 1 -T 15 -q"
DEVDEPS="build-essential python3-dev git" DEVDEPS="git build-essential libffi-dev libssl-dev python3-dev"
NPMURL="https://github.com/jc21/nginx-proxy-manager" NPMURL="https://github.com/jc21/nginx-proxy-manager"
cd $TEMPDIR cd $TEMPDIR
@ -64,28 +64,28 @@ if [ -f /lib/systemd/system/npm.service ]; then
/var/cache/nginx &>/dev/null /var/cache/nginx &>/dev/null
fi fi
# Update container OS
log "Updating container OS"
echo "fs.file-max = 65535" > /etc/sysctl.conf
runcmd apt-get update
runcmd apt-get upgrade -y
# Install dependencies # Install dependencies
log "Installing dependencies" log "Installing dependencies"
runcmd 'apt-get -y install --no-install-recommends wget gnupg openssl ca-certificates apache2-utils logrotate $DEVDEPS' runcmd apt-get update
export DEBIAN_FRONTEND=noninteractive
runcmd '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"
runcmd apt-get install -y -q --no-install-recommends python3 python3-pip python3-venv runcmd apt-get install -y -q --no-install-recommends python3 python3-distutils python3-venv
python3 -m venv /opt/certbot/ python3 -m venv /opt/certbot/
export PATH=/opt/certbot/bin:$PATH
grep -qo "/opt/certbot" /etc/environment || echo "$PATH" > /etc/environment
# Install certbot and python dependancies # Install certbot and python dependancies
runcmd pip3 install --upgrade setuptools runcmd wget -qO - https://bootstrap.pypa.io/get-pip.py | python -
runcmd pip3 install --no-cache-dir -U cryptography==3.3.2 if [ "$(getconf LONG_BIT)" = "32" ]; then
runcmd pip3 install --no-cache-dir cffi certbot runcmd pip install --no-cache-dir -U cryptography==3.3.2
fi
runcmd pip install --no-cache-dir cffi certbot
# Install openresty # Install openresty
log "Installing openresty" log "Installing openresty"
wget -O - https://openresty.org/package/pubkey.gpg | apt-key add - wget -qO - https://openresty.org/package/pubkey.gpg | apt-key add -
_distro_release=$(lsb_release -sc) _distro_release=$(lsb_release -sc)
_distro_release=$(wget $WGETOPT "http://openresty.org/package/ubuntu/dists/" -O - | grep -o "$_distro_release" | head -n1 || true) _distro_release=$(wget $WGETOPT "http://openresty.org/package/ubuntu/dists/" -O - | grep -o "$_distro_release" | head -n1 || true)
echo "deb [trusted=yes] http://openresty.org/package/ubuntu ${_distro_release:-focal} main" | tee /etc/apt/sources.list.d/openresty.list echo "deb [trusted=yes] http://openresty.org/package/ubuntu ${_distro_release:-focal} main" | tee /etc/apt/sources.list.d/openresty.list
@ -93,7 +93,7 @@ runcmd apt-get update && apt-get install -y -q --no-install-recommends openresty
# Install nodejs # Install nodejs
log "Installing nodejs" log "Installing nodejs"
runcmd wget -O - https://deb.nodesource.com/setup_14.x | bash - runcmd wget -qO - https://deb.nodesource.com/setup_14.x | bash -
runcmd apt-get install -y -q --no-install-recommends nodejs runcmd apt-get install -y -q --no-install-recommends nodejs
runcmd npm install --global yarn runcmd npm install --global yarn
@ -110,14 +110,14 @@ 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 /opt/certbot/bin/pip /usr/bin/pip
ln -sf /usr/bin/certbot /opt/certbot/bin/certbot ln -sf /opt/certbot/bin/certbot /usr/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
# Update NPM version in package.json files # Update NPM version in package.json files
sed -i "s+0.0.0+#$_latest_version+g" backend/package.json sed -i "s+0.0.0+$_latest_version+g" backend/package.json
sed -i "s+0.0.0+#$_latest_version+g" frontend/package.json sed -i "s+0.0.0+$_latest_version+g" frontend/package.json
# Fix nginx config files for use with openresty defaults # Fix nginx config files for use with openresty defaults
sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf

2
lxc/nginx-proxy-manager/setup.sh
View File

@ -19,7 +19,7 @@ wget -O "$TMP" "$URL/$DISTRO.sh"
chmod +x "$TMP" chmod +x "$TMP"
if [ "$(command -v bash)" ]; then if [ "$(command -v bash)" ]; then
bash "$TMP" sudo bash "$TMP"
else else
sh "$TMP" sh "$TMP"
fi fi