From e8953bd3e78f0f33d311175ad2269d93d67fc135 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 22 Dec 2020 15:42:46 +0100
Subject: [PATCH] Revert "Set up shiori as an alternative to Wallabag"

This reverts commit 00ac8e6bb27c230b97ffeb9da979f2a6a835ba9d.
---
 modules/webstack.nix | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/modules/webstack.nix b/modules/webstack.nix
index fd1528e..7c53352 100644
--- a/modules/webstack.nix
+++ b/modules/webstack.nix
@@ -86,11 +86,6 @@
         forceSSL = true;
         locations."/" = { proxyPass = "http://localhost:8080/"; };
       };
-      "shiori.coolneng.duckdns.org" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/" = { proxyPass = "http://localhost:8181/"; };
-      };
     };
   };
 
@@ -105,7 +100,6 @@
           "sync.coolneng.duckdns.org"
           "git.coolneng.duckdns.org"
           "rss.coolneng.duckdns.org"
-          "shiori.coolneng.duckdns.org"
         ];
       };
     };
@@ -120,7 +114,7 @@
   # PostgreSQL databases configuration
   services.postgresql = {
     enable = true;
-    package = pkgs.postgresql;
+    package = pkgs.postgresql_11;
     ensureDatabases = [ "gitea" "wallabag" ];
     ensureUsers = [
       {
@@ -162,19 +156,11 @@
     };
   };
 
-  # Enable shiori service
-  services.shiori = {
-    enable = true;
-    address = "localhost";
-    port = 8181;
-  };
-
   # Restart reverse proxy after services startup
   systemd.services.nginx.after = [
     "gitea.service"
     "syncthing.service"
     "miniflux.service"
     "radicale.service"
-    "shiori.service"
   ];
 }