Merge pull request #1920 from bunkerity/dev

Fix multiple issues regarding migration

src/common/core/backup/jobs/backup-data.py

@@ -66,6 +66,7 @@
     else:
         db = Database(LOGGER, sqlalchemy_string=getenv("DATABASE_URI"))
 
+    backed_up = False
     if force_backup or not already_done:
         if not force_backup:
             db_metadata = db.get_metadata()
@@ -75,6 +76,7 @@
                 sys_exit(0)
 
         backup_database(current_time, db, backup_dir)
+        backed_up = True
 
         if not force_backup:
             # Get all backup files in the directory
@@ -94,7 +96,8 @@
                 LOGGER.warning(f"Removing old backup file: {file}, as the rotation limit has been reached ...")
                 file.unlink()
 
-        update_cache_file(db, backup_dir)
+        if backed_up:
+            update_cache_file(db, backup_dir)
 except SystemExit as e:
     status = e.code
 except BaseException as e:

src/linux/Dockerfile-debian

@@ -87,7 +87,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/linux/Dockerfile-fedora

@@ -83,7 +83,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/linux/Dockerfile-rhel

@@ -95,7 +95,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/linux/Dockerfile-rhel9

@@ -98,7 +98,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/linux/Dockerfile-ubuntu

@@ -87,7 +87,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/linux/Dockerfile-ubuntu-jammy

@@ -87,7 +87,7 @@ RUN install -m 755 helpers/bwcli /usr/bin/bwcli && \
     find . -path ./deps -prune -o -type d -print0 | xargs -0 chmod 0750 && \
     chmod 755 /var/log/bunkerweb && \
     touch /var/log/bunkerweb/error.log /var/log/bunkerweb/access.log /var/log/bunkerweb/modsec_audit.log && \
-    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ && \
+    chmod 770 /var/cache/bunkerweb/ /var/tmp/bunkerweb/ /var/run/bunkerweb/ db/alembic db/alembic/alembic.ini db/alembic/env.py && \
     chmod 750 gen/*.py scheduler/*.py cli/*.py ui/*.sh helpers/*.sh /var/www/ && \
     find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
     find core/ ui/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \

src/scheduler/Dockerfile

@@ -68,8 +68,7 @@ RUN cp helpers/bwcli /usr/bin/ && \
   find core/ -type f -name "*.sh" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
   find core/ -type f -name "*.py" ! -path "core/modsecurity/files/*" -print0 | xargs -0 chmod 750 && \
   chmod 750 cli/main.py gen/*.py scheduler/main.py scheduler/entrypoint.sh helpers/*.sh deps/python/bin/* /usr/bin/bwcli && \
-  chmod 770 db/alembic/alembic.ini db/alembic/env.py && \
-  chmod u+w db/alembic && \
+  chmod 770 db/alembic db/alembic/alembic.ini db/alembic/env.py && \
   chmod 660 INTEGRATION