diff --git a/src/linux/Dockerfile-centos b/src/linux/Dockerfile-centos index 5ebfa5d28..edda07848 100644 --- a/src/linux/Dockerfile-centos +++ b/src/linux/Dockerfile-centos @@ -82,8 +82,8 @@ COPY src/linux/scripts /usr/share/bunkerweb/scripts COPY src/linux/fpm.sh /usr/share/fpm.sh RUN chmod +x /usr/share/bunkerweb/scripts/*.sh /usr/share/fpm.sh COPY src/linux/fpm-centos /usr/share/.fpm -COPY src/linux/bunkerweb.service /etc/systemd/system/bunkerweb.service -COPY src/linux/bunkerweb-ui.service /etc/systemd/system/bunkerweb-ui.service +COPY src/linux/bunkerweb.service /lib/systemd/system/bunkerweb.service +COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service # Generate DEB at startup VOLUME /data diff --git a/src/linux/Dockerfile-debian b/src/linux/Dockerfile-debian index eabe3e01a..6b873e233 100644 --- a/src/linux/Dockerfile-debian +++ b/src/linux/Dockerfile-debian @@ -87,8 +87,8 @@ COPY src/linux/scripts /usr/share/bunkerweb/scripts COPY src/linux/fpm.sh /usr/share/fpm.sh RUN chmod +x /usr/share/bunkerweb/scripts/*.sh /usr/share/fpm.sh COPY src/linux/fpm-debian /usr/share/.fpm -COPY src/linux/bunkerweb.service /etc/systemd/system/bunkerweb.service -COPY src/linux/bunkerweb-ui.service /etc/systemd/system/bunkerweb-ui.service +COPY src/linux/bunkerweb.service /lib/systemd/system/bunkerweb.service +COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service # Generate DEB at startup VOLUME /data diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index c45337705..90388e1c5 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -77,8 +77,8 @@ COPY src/linux/scripts /usr/share/bunkerweb/scripts COPY src/linux/fpm.sh /usr/share/fpm.sh RUN chmod +x /usr/share/bunkerweb/scripts/*.sh /usr/share/fpm.sh COPY src/linux/fpm-fedora /usr/share/.fpm -COPY src/linux/bunkerweb.service /etc/systemd/system/bunkerweb.service -COPY src/linux/bunkerweb-ui.service /etc/systemd/system/bunkerweb-ui.service +COPY src/linux/bunkerweb.service /lib/systemd/system/bunkerweb.service +COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service # Generate DEB at startup VOLUME /data diff --git a/src/linux/Dockerfile-rhel b/src/linux/Dockerfile-rhel index 73702566a..f643aa287 100644 --- a/src/linux/Dockerfile-rhel +++ b/src/linux/Dockerfile-rhel @@ -82,8 +82,8 @@ COPY src/linux/scripts /usr/share/bunkerweb/scripts COPY src/linux/fpm.sh /usr/share/fpm.sh RUN chmod +x /usr/share/bunkerweb/scripts/*.sh /usr/share/fpm.sh COPY src/linux/fpm-rhel /usr/share/.fpm -COPY src/linux/bunkerweb.service /etc/systemd/system/bunkerweb.service -COPY src/linux/bunkerweb-ui.service /etc/systemd/system/bunkerweb-ui.service +COPY src/linux/bunkerweb.service /lib/systemd/system/bunkerweb.service +COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service # Generate RPM at startup VOLUME /data diff --git a/src/linux/Dockerfile-ubuntu b/src/linux/Dockerfile-ubuntu index a7fe93c9b..8c5aacb00 100644 --- a/src/linux/Dockerfile-ubuntu +++ b/src/linux/Dockerfile-ubuntu @@ -80,8 +80,8 @@ COPY src/linux/scripts /usr/share/bunkerweb/scripts COPY src/linux/fpm.sh /usr/share/fpm.sh RUN chmod +x /usr/share/bunkerweb/scripts/*.sh /usr/share/fpm.sh COPY src/linux/fpm-ubuntu /usr/share/.fpm -COPY src/linux/bunkerweb.service /etc/systemd/system/bunkerweb.service -COPY src/linux/bunkerweb-ui.service /etc/systemd/system/bunkerweb-ui.service +COPY src/linux/bunkerweb.service /lib/systemd/system/bunkerweb.service +COPY src/linux/bunkerweb-ui.service /lib/systemd/system/bunkerweb-ui.service # Generate DEB at startup VOLUME /data diff --git a/src/linux/fpm-centos b/src/linux/fpm-centos index a8ee154c3..fc1c3b91c 100644 --- a/src/linux/fpm-centos +++ b/src/linux/fpm-centos @@ -3,10 +3,10 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo +--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --description "BunkerWeb %VERSION% for CentOS Stream 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " --after-install /usr/share/bunkerweb/scripts/postinstall.sh --after-remove /usr/share/bunkerweb/scripts/afterRemove.sh -/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 /etc/systemd/system/bunkerweb.service=/etc/systemd/system/bunkerweb.service /etc/systemd/system/bunkerweb-ui.service=/etc/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file +/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 /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file diff --git a/src/linux/fpm-debian b/src/linux/fpm-debian index f8860cf45..ecec54884 100644 --- a/src/linux/fpm-debian +++ b/src/linux/fpm-debian @@ -3,10 +3,10 @@ --license agpl3 --version %VERSION% --architecture amd64 ---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.22.1-1~bullseye' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo +--depends bash --depends python3 --depends procps --depends python3-pip --depends 'nginx = 1.22.1-1~bullseye' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo --description "BunkerWeb %VERSION% for Debian 11" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " --after-install /usr/share/bunkerweb/scripts/postinstall.sh --after-remove /usr/share/bunkerweb/scripts/afterRemove.sh -/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 /etc/systemd/system/bunkerweb.service=/etc/systemd/system/bunkerweb.service /etc/systemd/system/bunkerweb-ui.service=/etc/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file +/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 /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file diff --git a/src/linux/fpm-fedora b/src/linux/fpm-fedora index bfa9bb0db..ec11d143b 100644 --- a/src/linux/fpm-fedora +++ b/src/linux/fpm-fedora @@ -3,10 +3,10 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends python3 --depends 'nginx = 1:1.22.1-2.fc36' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo +--depends bash --depends python3 --depends 'nginx = 1:1.22.1-2.fc36' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --description "BunkerWeb %VERSION% for Fedora 36" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " --after-install /usr/share/bunkerweb/scripts/postinstall.sh --after-remove /usr/share/bunkerweb/scripts/afterRemove.sh -/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 /etc/systemd/system/bunkerweb.service=/etc/systemd/system/bunkerweb.service /etc/systemd/system/bunkerweb-ui.service=/etc/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file +/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 /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file diff --git a/src/linux/fpm-rhel b/src/linux/fpm-rhel index d2d61f4e8..3a9938538 100644 --- a/src/linux/fpm-rhel +++ b/src/linux/fpm-rhel @@ -3,10 +3,10 @@ --license agpl3 --version %VERSION% --architecture x86_64 ---depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo +--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --description "BunkerWeb %VERSION% for Rhel 8" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " --after-install /usr/share/bunkerweb/scripts/postinstall.sh --after-remove /usr/share/bunkerweb/scripts/afterRemove.sh -/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 /etc/systemd/system/bunkerweb.service=/etc/systemd/system/bunkerweb.service /etc/systemd/system/bunkerweb-ui.service=/etc/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file +/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 /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file diff --git a/src/linux/fpm-ubuntu b/src/linux/fpm-ubuntu index a142af509..09fc18461 100644 --- a/src/linux/fpm-ubuntu +++ b/src/linux/fpm-ubuntu @@ -2,7 +2,7 @@ --name bunkerweb --license agpl3 --version %VERSION% ---depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.22.1-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo +--depends bash --depends python3 --depends python3-pip --depends 'nginx = 1.22.1-1~jammy' --depends libcurl4 --depends libgeoip-dev --depends libxml2 --depends libyajl2 --depends libmagic1 --depends net-tools --depends sudo--depends procps --description "BunkerWeb %VERSION% for Ubuntu 22.04" --url "https://www.bunkerweb.io" --maintainer "Bunkerity " @@ -11,4 +11,4 @@ --deb-systemd-auto-start /etc/systemd/system/bunkerweb.service --deb-systemd-auto-start /etc/systemd/system/bunkerweb-ui.service --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 +/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 /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt \ No newline at end of file diff --git a/src/linux/scripts/afterRemove.sh b/src/linux/scripts/afterRemove.sh index e5db9e7c5..734aca6b4 100644 --- a/src/linux/scripts/afterRemove.sh +++ b/src/linux/scripts/afterRemove.sh @@ -58,11 +58,11 @@ if [ $? -eq 0 ] ; then fi # echo "ℹ️ Remove bunkerweb-ui service" -if [ -f "/etc/systemd/system/bunkerweb-ui.service" ] ; then +if [ -f "/lib/systemd/system/bunkerweb-ui.service" ] ; then echo "ℹ️ Remove bunkerweb-ui service" do_and_check_cmd systemctl stop bunkerweb-ui do_and_check_cmd systemctl disable bunkerweb-ui - do_and_check_cmd rm -f /etc/systemd/system/bunkerweb-ui.service + do_and_check_cmd rm -f /lib/systemd/system/bunkerweb-ui.service do_and_check_cmd systemctl daemon-reload do_and_check_cmd systemctl reset-failed fi diff --git a/src/linux/scripts/bunkerweb-ui.sh b/src/linux/scripts/bunkerweb-ui.sh index 9804228db..2d8c8f50a 100755 --- a/src/linux/scripts/bunkerweb-ui.sh +++ b/src/linux/scripts/bunkerweb-ui.sh @@ -54,6 +54,6 @@ case $1 in reload ;; *) - echo "Usage: ./bunkerweb-ui.sh start|stop|reload" + echo "Usage: ./bunkerweb-ui.sh start" ;; esac \ No newline at end of file diff --git a/src/linux/scripts/postinstall.sh b/src/linux/scripts/postinstall.sh index e3d0ebff3..77b410474 100644 --- a/src/linux/scripts/postinstall.sh +++ b/src/linux/scripts/postinstall.sh @@ -3,6 +3,9 @@ # Stop nginx if it's running and remove the old config file if it exists systemctl start nginx +# Give all the permissions to the nginx user +chown -R nginx:nginx /usr/share/bunkerweb /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb + # Start bunkerweb service as nginx user and enable it to start on boot systemctl enable bunkerweb systemctl start bunkerweb diff --git a/src/linux/scripts/start.sh b/src/linux/scripts/start.sh index 566df3234..ba9d6a300 100644 --- a/src/linux/scripts/start.sh +++ b/src/linux/scripts/start.sh @@ -20,15 +20,6 @@ function display_help() export PYTHONPATH=/usr/share/bunkerweb/deps/python/ -# Create user scheduler if not exists -if ! id -u scheduler > /dev/null 2>&1; then - addgroup --gid 120 scheduler - # Line below it's not working on Ubuntu 22.04 - # Correct way to do it is to use useradd - adduser --uid 120 --gid 120 --disabled-password --gecos "" scheduler - chown -R root:scheduler /usr/share/bunkerweb /var/cache/bunkerweb /var/lib/bunkerweb /etc/bunkerweb /var/tmp/bunkerweb -fi - ############################################################# # Start # #############################################################