From 3fb4ca73609de1928892114a194a4da582fde6c0 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Wed, 26 Jan 2022 11:43:07 -0500
Subject: [PATCH] Update npm_setup.sh

---
 setup/npm_setup.sh | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/setup/npm_setup.sh b/setup/npm_setup.sh
index 78df2a23..53dcb7b0 100644
--- a/setup/npm_setup.sh
+++ b/setup/npm_setup.sh
@@ -23,25 +23,21 @@ function msg() {
   echo -e "$TEXT"
 }
 
-# Prepare container OS
 echo -e "${CHECKMARK} \e[1;92m Setting up Container OS... \e[0m"
 sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
 locale-gen >/dev/null
 apt-get -y purge openssh-{client,server} >/dev/null
 apt-get autoremove >/dev/null
 
-# Update container OS
 echo -e "${CHECKMARK} \e[1;92m Updating Container OS... \e[0m"
 apt update &>/dev/null
 apt-get -qqy upgrade &>/dev/null
 
-  # Install dependencies
   echo -e "${CHECKMARK} \e[1;92m Installing Dependencies... \e[0m"
   echo "fs.file-max = 65535" > /etc/sysctl.conf
   apt-get update &>/dev/null
   apt-get -y install --no-install-recommends sudo curl wget gnupg openssl ca-certificates apache2-utils logrotate build-essential python3-dev git lsb-release &>/dev/null
 
-  # Install Python
   echo -e "${CHECKMARK} \e[1;92m Installing Python... \e[0m"
   apt-get install -y -q --no-install-recommends python3 python3-pip python3-venv &>/dev/null
   pip3 install --upgrade setuptools &>/dev/null
@@ -51,8 +47,7 @@ apt-get -qqy upgrade &>/dev/null
     python3 -m pip install --no-cache-dir -U cryptography==3.3.2 &>/dev/null
   fi
   python3 -m pip install --no-cache-dir cffi certbot &>/dev/null
-#fi  
-  # Install openresty
+  
 echo -e "${CHECKMARK} \e[1;92m Installing Openresty... \e[0m"
 wget -q -O - https://openresty.org/package/pubkey.gpg | apt-key add - &>/dev/null
 codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release` &>/dev/null
@@ -69,30 +64,25 @@ sudo apt-get install -y nodejs git make g++ gcc &>/dev/null
 echo -e "${CHECKMARK} \e[1;92m Installing Yarn... \e[0m"
 npm install --global yarn &>/dev/null
 
-# Download nginx-proxy-manager source
 echo -e "${CHECKMARK} \e[1;92m Downloading NPM v2.9.15... \e[0m"
-wget https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.15 -O - | tar -xz &>/dev/null
+wget -q https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.15 -O - | tar -xz &>/dev/null
 cd ./nginx-proxy-manager-2.9.15
 
-# Crate required symbolic links
 echo -e "${CHECKMARK} \e[1;92m Setting up Enviroment... \e[0m"
 ln -sf /usr/bin/python3 /usr/bin/python
 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/ /etc/nginx
 
-# Update NPM version in package.json files
 sed -i "s+0.0.0+#v2.9.15+g" backend/package.json
 sed -i "s+0.0.0+#v2.9.15+g" frontend/package.json
 
-# Fix nginx config files for use with openresty defaults
 sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf
 NGINX_CONFS=$(find "$(pwd)" -type f -name "*.conf")
 for NGINX_CONF in $NGINX_CONFS; do
   sed -i 's+include conf.d+include /etc/nginx/conf.d+g' "$NGINX_CONF"
 done
 
-# Copy runtime files
 mkdir -p /var/www/html /etc/nginx/logs
 cp -r docker/rootfs/var/www/html/* /var/www/html/
 cp -r docker/rootfs/etc/nginx/* /etc/nginx/
@@ -101,7 +91,6 @@ cp docker/rootfs/etc/logrotate.d/nginx-proxy-manager /etc/logrotate.d/nginx-prox
 ln -sf /etc/nginx/nginx.conf /etc/nginx/conf/nginx.conf
 rm -f /etc/nginx/conf.d/dev.conf
 
-# Create required folders
 mkdir -p /tmp/nginx/body \
 /run/nginx \
 /data/nginx \
@@ -122,21 +111,17 @@ mkdir -p /tmp/nginx/body \
 chmod -R 777 /var/cache/nginx
 chown root /tmp/nginx
 
-# Dynamically generate resolvers file, if resolver is IPv6, enclose in `[]`
 echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" > /etc/nginx/conf.d/include/resolvers.conf
 
-# Generate dummy self-signed certificate.
 if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then
   echo -e "${CHECKMARK} \e[1;92m Generating dummy SSL Certificate... \e[0m"
   openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null
 fi
 
-# Copy app files
 mkdir -p /app/global /app/frontend/images
 cp -r backend/* /app
 cp -r global/* /app/global
 
-# Build the frontend
 echo -e "${CHECKMARK} \e[1;92m Building Frontend... \e[0m"
 cd ./frontend
 export NODE_ENV=development
@@ -145,7 +130,6 @@ yarn build &>/dev/null
 cp -r dist/* /app/frontend
 cp -r app-images/* /app/frontend/images
 
-# Initialize backend
 echo -e "${CHECKMARK} \e[1;92m Initializing Backend... \e[0m"
 rm -rf /app/config/default.json &>/dev/null
 if [ ! -f /app/config/production.json ]; then
@@ -165,9 +149,8 @@ EOF
 fi
 cd /app
 export NODE_ENV=development
-yarn install --network-timeout=30000 
+yarn install --network-timeout=30000 &>/dev/null
 
-# Create NPM service
 echo -e "${CHECKMARK} \e[1;92m Creating NPM Service... \e[0m"
 cat << 'EOF' > /lib/systemd/system/npm.service
 [Unit]
@@ -201,7 +184,6 @@ EOF
 systemctl daemon-reload
 systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
 
-# Start services
 echo -e "${CHECKMARK} \e[1;92m Starting Services... \e[0m"
 systemctl enable npm &>/dev/null
 systemctl start openresty