From 8e30512a3a6afed60a67ac15e3713745e4de7fa8 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <t@tsvallender.co.uk>
Date: Tue, 10 Oct 2023 11:39:54 +0100
Subject: [PATCH] Wallabag setup complete

---
 system/kernighan/kernighan.nix      | 13 +++++++------
 system/shared/services/nginx.nix    |  2 +-
 system/shared/services/wallabag.nix | 12 ++++++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix
index 522298f..bd614b0 100644
--- a/system/kernighan/kernighan.nix
+++ b/system/kernighan/kernighan.nix
@@ -2,6 +2,13 @@
 { config, pkgs, inputs, ... }:
 
 {
+
+  virtualisation.docker = {
+    enable = true;
+    storageDriver = "btrfs";
+    logDriver = "json-file";
+  };
+
   imports =
     [
       ../shared/shared-configuration.nix
@@ -37,12 +44,6 @@
     vim
   ];
 
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "btrfs";
-    logDriver = "json-file";
-  };
-
   users.users.kamal = {
     isNormalUser = true;
     extraGroups = [
diff --git a/system/shared/services/nginx.nix b/system/shared/services/nginx.nix
index 74a0831..ed6d9bd 100644
--- a/system/shared/services/nginx.nix
+++ b/system/shared/services/nginx.nix
@@ -66,7 +66,7 @@
       forceSSL = true;
       enableACME = true;
       locations."/" = {
-        proxyPass = "http://127.0.0.1:5232";
+        proxyPass = "http://127.0.0.1:8485";
       };
     };
   };
diff --git a/system/shared/services/wallabag.nix b/system/shared/services/wallabag.nix
index cd3617d..f228da9 100644
--- a/system/shared/services/wallabag.nix
+++ b/system/shared/services/wallabag.nix
@@ -1,15 +1,19 @@
 { config, pkgs, inputs, ... }:
 
 {
+  virtualisation.oci-containers.backend = "docker";
   virtualisation.oci-containers.containers = {
     wallabag = {
-      image = "wallabag/wallabag:2.6.7";
+      autoStart = true;
+      image = "wallabag/wallabag";
       environment = {
-        SYMFONY__ENV__DOMAIN_NAME = "http://localhost";
+        SYMFONY__ENV__DOMAIN_NAME = "https://wb.tsvallender.co.uk";
       };
       volumes = [
-        "/opt/wallabag/data:/var/www/wallabag/data"
-        "/opt/wallabag/images:/var/www/wallabag/images"
+        "wallabag_data:/var/www/wallabag/data"
+      ];
+      ports = [
+        "8485:80"
       ];
     };
   };