Merge pull request #245 from seanmorley15/development

Fix compose file image error
seanmorley15 · Aug 18, 2024 · ad4c0b3 · ad4c0b3
2 parents b434e21 + e1e750f
commit ad4c0b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/backup.sh b/backup.sh
@@ -0,0 +1,5 @@
+docker run --rm \
+  -v adventurelog_adventurelog_media:/backup-volume \
+  -v "$(pwd)":/backup \
+  busybox \
+  tar -zcvf /backup/adventurelog-backup.tar.gz /backup-volume
diff --git a/docker-compose-traefik.yaml b/docker-compose-traefik.yaml
@@ -1,15 +1,15 @@
-version: '3.9'
+version: "3.9"
 
 services:
   traefik:
     image: traefik:v2.11
     command:
-      - "--api.insecure=true"  # Enable Traefik dashboard (remove in production)
+      - "--api.insecure=true" # Enable Traefik dashboard (remove in production)
       - "--providers.docker=true"
       - "--entrypoints.web.address=:80"
       - "--entrypoints.websecure.address=:443"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
-      - "--certificatesresolvers.letsencrypt.acme.email=your-email@example.com"  # Replace with your email
+      - "--certificatesresolvers.letsencrypt.acme.email=your-email@example.com" # Replace with your email
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
     ports:
       - "80:80"
@@ -26,20 +26,20 @@ services:
     environment:
       POSTGRES_DB: database
       POSTGRES_USER: adventure
-      POSTGRES_PASSWORD: your_postgres_password  # Replace with the actual password
+      POSTGRES_PASSWORD: your_postgres_password # Replace with the actual password
     volumes:
       - postgres-data:/var/lib/postgresql/data/
 
   web:
-    image: ghcr.io/seanmorley15/adventurelog-web:latest
+    image: ghcr.io/seanmorley15/adventurelog-frontend:latest
     restart: unless-stopped
     environment:
       PUBLIC_SERVER_URL: "http://server:8000"
       BODY_SIZE_LIMIT: "100000"
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.adventurelog.entrypoints=websecure"
-      - "traefik.http.routers.adventurelog.rule=Host(`yourdomain.com`) && !PathPrefix(`/media`)"  # Replace with your domain
+      - "traefik.http.routers.adventurelog.rule=Host(`yourdomain.com`) && !PathPrefix(`/media`)" # Replace with your domain
       - "traefik.http.routers.adventurelog.tls=true"
       - "traefik.http.routers.adventurelog.tls.certresolver=letsencrypt"
 
@@ -49,7 +49,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.nginx.entrypoints=websecure"
-      - "traefik.http.routers.nginx.rule=Host(`yourdomain.com`) && PathPrefix(`/media`)"  # Replace with your domain
+      - "traefik.http.routers.nginx.rule=Host(`yourdomain.com`) && PathPrefix(`/media`)" # Replace with your domain
       - "traefik.http.routers.nginx.tls=true"
       - "traefik.http.routers.nginx.tls.certresolver=letsencrypt"
       - "traefik.http.middlewares.nginx-stripprefix.stripprefix.prefixes=/media"
@@ -64,15 +64,15 @@ services:
       PGHOST: "db"
       PGDATABASE: "database"
       PGUSER: "adventure"
-      PGPASSWORD: your_postgres_password  # Replace with the actual password
-      SECRET_KEY: your_secret_key  # Replace with the actual secret key
+      PGPASSWORD: your_postgres_password # Replace with the actual password
+      SECRET_KEY: your_secret_key # Replace with the actual secret key
       DJANGO_ADMIN_USERNAME: "admin"
-      DJANGO_ADMIN_PASSWORD: your_admin_password  # Replace with the actual admin password
-      DJANGO_ADMIN_EMAIL: "[email protected]"  # Replace with your email
-      PUBLIC_URL: "https://yourdomain.com"  # Replace with your domain
-      CSRF_TRUSTED_ORIGINS: "https://yourdomain.com"  # Replace with your domain
+      DJANGO_ADMIN_PASSWORD: your_admin_password # Replace with the actual admin password
+      DJANGO_ADMIN_EMAIL: "[email protected]" # Replace with your email
+      PUBLIC_URL: "https://yourdomain.com" # Replace with your domain
+      CSRF_TRUSTED_ORIGINS: "https://yourdomain.com" # Replace with your domain
       DEBUG: "false"
-      FRONTEND_URL: "https://yourdomain.com"  # Replace with your domain
+      FRONTEND_URL: "https://yourdomain.com" # Replace with your domain
     volumes:
       - adventurelog-media:/code/media
 

diff --git a/frontend/src/routes/signup/+page.svelte b/frontend/src/routes/signup/+page.svelte
@@ -96,24 +96,18 @@
 		</div>
 	{:else}
 		<div class="card card-compact w-96 bg-base-100 shadow-xl p-6 mt-4 mb-4">
-			<article class="text-center text-4xl font-extrabold">
-				<h1>Signup is disabled for this server.</h1>
+			<article class="text-center">
+				<h1 class="text-4xl font-extrabold mb-6">Signup is disabled for this server.</h1>
+				<p>Please contact the server administrator if you think this is an error.</p>
+				<br />
+				<p>If you are the administrator, users can be registered via the admin site.</p>
 			</article>
 
 			{#if errors.message}
 				<div class="text-center text-error mt-4">
 					{errors.message}
 				</div>
 			{/if}
-
-			<div class="flex justify-center mt-12 mr-25 ml-25">
-				<blockquote class="w-80 text-center text-lg break-words">
-					{#if quote != ''}
-						{quote}
-					{/if}
-					<!-- <footer class="text-sm">- Steve Jobs</footer> -->
-				</blockquote>
-			</div>
 		</div>
 	{/if}
 </div>