Merge pull request #521 from bunkerity/staging

Merge branch "staging" into branch "dev"

examples/hardened/docker-compose.yml

@@ -15,6 +15,7 @@ services:
     tmpfs:
       - /tmp:mode=0770,uid=0,gid=101
       - /var/tmp/bunkerweb:mode=0770,uid=0,gid=101
+      - /var/run/bunkerweb:mode=0770,uid=0,gid=101
       - /var/cache/bunkerweb:mode=0770,uid=0,gid=101
       - /etc/nginx:mode=0770,uid=0,gid=101
     ports:

src/common/core/letsencrypt/jobs/certbot-new.py

@@ -97,7 +97,7 @@ try:
         sqlalchemy_string=getenv("DATABASE_URI", None),
     )
 
-    tgz = get_file_in_db("folder.tgz", db)
+    tgz = get_file_in_db("folder.tgz", db, job_name="certbot-renew")
     if tgz:
         # Delete folder if needed
         if letsencrypt_path.exists():
@@ -191,7 +191,7 @@ try:
     bio.seek(0, 0)
 
     # Put tgz in cache
-    cached, err = set_file_in_db("folder.tgz", bio.read(), db)
+    cached, err = set_file_in_db("folder.tgz", bio.read(), db, job_name="certbot-renew")
 
     if not cached:
         logger.error(f"Error while saving Let's Encrypt data to db cache : {err}")

src/common/utils/jobs.py

@@ -70,9 +70,9 @@ def is_cached_file(
     return is_cached and cached_file
 
 
-def get_file_in_db(file: Union[str, Path], db) -> Optional[bytes]:
+def get_file_in_db(file: Union[str, Path], db, *, job_name: Optional[str] = None) -> Optional[bytes]:
     cached_file = db.get_job_cache_file(
-        basename(getsourcefile(_getframe(1))).replace(".py", ""), normpath(file)
+        job_name or basename(getsourcefile(_getframe(1))).replace(".py", ""), normpath(file)
     )
     if not cached_file:
         return None