diff --git a/src/linux/bunkerweb-ui.service b/src/linux/bunkerweb-ui.service index 03b0f2ba8..c81b34a80 100644 --- a/src/linux/bunkerweb-ui.service +++ b/src/linux/bunkerweb-ui.service @@ -1,10 +1,10 @@ [Unit] Description=BunkerWeb UI service Documentation=https://docs.bunkerweb.io -After=network.target +After=bunkerweb.service [Service] -Restart=always +Restart=no StartLimitBurst=1 User=root ExecStart=/usr/share/bunkerweb/scripts/bunkerweb-ui.sh start diff --git a/src/linux/fpm-ubuntu b/src/linux/fpm-ubuntu index bdf4377f6..a142af509 100644 --- a/src/linux/fpm-ubuntu +++ b/src/linux/fpm-ubuntu @@ -10,4 +10,5 @@ --after-remove /usr/share/bunkerweb/scripts/afterRemove.sh --deb-systemd-auto-start /etc/systemd/system/bunkerweb.service --deb-systemd-auto-start /etc/systemd/system/bunkerweb-ui.service -/usr/share/bunkerweb/=/usr/share/bunkerweb/ /usr/bin/bwcli=/usr/bin/bwcli /etc/bunkerweb/=/etc/bunkerweb /var/tmp/bunkerweb/=/var/tmp/bunkerweb /var/cache/bunkerweb/=/var/cache/bunkerweb /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file +--deb-no-default-config-files +/usr/share/bunkerweb/=/usr/share/bunkerweb/ /usr/bin/bwcli=/usr/bin/bwcli /etc/bunkerweb/=/etc/bunkerweb /var/tmp/bunkerweb/=/var/tmp/bunkerweb /var/cache/bunkerweb/=/var/cache/bunkerweb /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt /etc/systemd/system/bunkerweb.service=/etc/systemd/system/bunkerweb.service /etc/systemd/system/bunkerweb-ui.service=/etc/systemd/system/bunkerweb-ui.service \ No newline at end of file diff --git a/src/linux/scripts/bunkerweb-ui.sh b/src/linux/scripts/bunkerweb-ui.sh index 7c044f724..9804228db 100755 --- a/src/linux/scripts/bunkerweb-ui.sh +++ b/src/linux/scripts/bunkerweb-ui.sh @@ -2,10 +2,20 @@ export PYTHONPATH=/usr/share/bunkerweb/deps/python +# Create ui.env file if it doesn't exist +if [ ! -f /etc/bunkerweb/ui.env ]; then + # Creating a file called `ui.env` in the `/etc/bunkerweb` directory. + echo -e "ADMIN_USERNAME=admin\nADMIN_PASSWORD=changeme\nABSOLUTE_URI=" > /etc/bunkerweb/ui.env +fi + # function to start the UI start() { echo "Starting UI" - python3 -m gunicorn --bind=0.0.0.0:7000 --chdir /usr/share/bunkerweb/ui/ --workers=1 --threads=2 --user scheduler --group scheduler main:app + python3 -m gunicorn --bind=127.0.0.1:7000 --chdir /usr/share/bunkerweb/ui/ --workers=1 --threads=2 --user scheduler --group scheduler main:app & + # Source /etc/bunkerweb/ui.env to load variables + source /etc/bunkerweb/ui.env + # Export all variables to environment + export $(cat /etc/bunkerweb/ui.env) } # function to stop the UI diff --git a/src/linux/scripts/postinstall.sh b/src/linux/scripts/postinstall.sh index 3c7947a8e..e3d0ebff3 100644 --- a/src/linux/scripts/postinstall.sh +++ b/src/linux/scripts/postinstall.sh @@ -3,12 +3,6 @@ # Stop nginx if it's running and remove the old config file if it exists systemctl start nginx -# Change the ownership of /usr/share/bunkerweb to nginx -chown -R nginx:nginx /usr/share/bunkerweb - -# Change the ownership of bunkerweb.service to nginx -# chown nginx:nginx /etc/systemd/system/bunkerweb.service - # Start bunkerweb service as nginx user and enable it to start on boot systemctl enable bunkerweb systemctl start bunkerweb