Merge branch 'prod' into bump_prod

.env

@@ -3,8 +3,8 @@ MAX_PENDING_TIME=600
 MAX_STORE_TIME=259200
 FLASK_DEBUG=0
 FLASK_ENV=production
-DB_URI=postgresql://aperiuser:aperipass@postgres:5432/aperisolve
+DB_URI=postgresql://aperiuser:iacyANdLeUREonIuMPorpHySTaIsHEAn@postgres:5432/aperisolve
 RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
 POSTGRES_DB=aperisolve
 POSTGRES_USER=aperiuser
-POSTGRES_PASSWORD=aperipass
+POSTGRES_PASSWORD=iacyANdLeUREonIuMPorpHySTaIsHEAn

.github/workflows/releases.yml

@@ -39,6 +39,5 @@ jobs:
           context: ./
           push: true
           tags: |
-                 ghcr.io/${{ env.lower_actor }}/aperisolve:latest
+                 ghcr.io/${{ env.lower_actor }}/aperisolve:prod
-                 ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }}
   

aperisolve/app.py

@@ -255,6 +255,12 @@ def get_image(
     return send_file(output_file, as_attachment=True)
 
 
+@app.route("/ads.txt")
+def google_ads() -> str:
+    """Google Ads required file"""
+    return "google.com, pub-2324718887045017, DIRECT, f08c47fec0942fa0"
+
+
 if __name__ == "__main__":
     debug_mode = os.environ.get("FLASK_DEBUG", "false").lower() == "true"
     app.run(host="0.0.0.0", port=5000, debug=debug_mode)

aperisolve/templates/base.html

@@ -9,6 +9,8 @@
   <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/7.0.1/css/all.min.css" rel="stylesheet">
   <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css" rel="stylesheet" />
   <link href="/static/css/aperisolve.css" rel="stylesheet" />
+  <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-2324718887045017"
+     crossorigin="anonymous"></script>
 </head>
 
 <body class="text-light">

compose.yml

@@ -1,11 +1,11 @@
 services:
   web:
-    image: ghcr.io/zeecka/aperisolve:latest
+    image: ghcr.io/zeecka/aperisolve:prod
     #build: .
     container_name: aperisolve-web
     restart: always
     ports:
-      - "5000:5000"
+      - "80:5000"
     volumes:
       - apresults:/aperisolve/results
     depends_on:
@@ -19,7 +19,7 @@ services:
       - .env
 
   worker:
-    image: ghcr.io/zeecka/aperisolve:latest
+    image: ghcr.io/zeecka/aperisolve:prod
     #build: .
     container_name: aperisolve-worker
     restart: always