From 5208a63fb460ca143b7ec341f08d80f979d33168 Mon Sep 17 00:00:00 2001
From: Ada <ada@gnous.eu>
Date: Sat, 11 May 2024 14:54:55 +0200
Subject: [PATCH] WIP

---
 .env                                      | 2 +-
 .goreleaser.yaml                          | 6 +++---
 .woodpecker/build.yaml                    | 2 +-
 .woodpecker/release.yaml                  | 2 +-
 deployment/docker/docker-compose.dev.yaml | 6 ++----
 deployment/docker/docker-compose.yaml     | 2 --
 deployment/goreleaser/preinstall.sh       | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index c92e397..a7c0978 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-PLAKKEN_LISTEN=:5000
+PLAKKEN_LISTEN=:3000
 PLAKKEN_REDIS_ADDRESS=localhost:6379
 PLAKKEN_REDIS_USER=
 PLAKKEN_REDIS_PASSWORD=
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 2d99633..70e4edd 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -52,9 +52,9 @@ nfpms:
       - src: plakken.service
         dst: /usr/lib/systemd/system/plakken.service
     scripts:
-      preinstall: "deployement/goreleaser/preinstall.sh"
-      preremove: "deployement/goreleaser/preremove.sh"
-      postremove: "deployement/goreleaser/postremove.sh"
+      preinstall: "deployment/goreleaser/preinstall.sh"
+      preremove: "deployment/goreleaser/preremove.sh"
+      postremove: "deployment/goreleaser/postremove.sh"
 
 checksum:
   algorithm: sha256
diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index c1c7157..9b20d8a 100644
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -6,7 +6,7 @@ steps:
       dockerfile: deployment/docker/Dockerfile
       platforms: linux/amd64,linux/arm64/v8
       registry: https://git.gnous.eu
-      tag: ${CI_COMMIT}
+      tag: ${CI_COMMIT_SHA}
       username:
           from_secret: docker_username
       password:
diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml
index 06b94ee..9ebb01c 100644
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -11,7 +11,7 @@ steps:
     image: woodpeckerci/plugin-docker-buildx
     settings:
       repo: git.gnous.eu/${CI_REPO_OWNER}/plakken
-      dockerfile: docker/Dockerfile
+      dockerfile: deployment/docker/Dockerfile
       platforms: linux/amd64,linux/arm64/v8
       registry: https://git.gnous.eu
       tags:
diff --git a/deployment/docker/docker-compose.dev.yaml b/deployment/docker/docker-compose.dev.yaml
index 7270d45..d9fa1f6 100644
--- a/deployment/docker/docker-compose.dev.yaml
+++ b/deployment/docker/docker-compose.dev.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 networks:
   plakken:
     external: false
@@ -7,8 +5,8 @@ networks:
 services:
   server:
     build:
-      context: ../
-      dockerfile: docker/Dockerfile
+      context: ../../
+      dockerfile: deployment/docker/Dockerfile
     restart: always
     container_name: plakken
     networks:
diff --git a/deployment/docker/docker-compose.yaml b/deployment/docker/docker-compose.yaml
index 7272d1d..ee55c06 100644
--- a/deployment/docker/docker-compose.yaml
+++ b/deployment/docker/docker-compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 networks:
   plakken:
     external: false
diff --git a/deployment/goreleaser/preinstall.sh b/deployment/goreleaser/preinstall.sh
index 150328b..a041ccf 100644
--- a/deployment/goreleaser/preinstall.sh
+++ b/deployment/goreleaser/preinstall.sh
@@ -3,7 +3,7 @@ if ! getent group plakken > /dev/null; then
 fi
 
 if ! getent passwd plakken > /dev/null; then
-    useradd -r -d /var/lib/plakken -s /sbin/nologin -G plakken -c "Plakken server" 111111111111111111 plakken
+    useradd -r -d /var/lib/plakken -s /sbin/nologin -g plakken -c "Plakken server" plakken
 fi
 if ! test -d /var/lib/plakken; then
     mkdir -p /var/lib/plakken