From fbef9f2cd8306f8deed3b59dc8b5ef9a1f5dc870 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 27 Apr 2021 22:27:13 +0100
Subject: [PATCH] hosts/athame: PostgreSQL moved to service definitions

---
 hosts/athame/nixos/default.nix  |  8 +++++---
 hosts/athame/nixos/postgres.nix | 17 -----------------
 services/matrix.nix             | 11 +++++++++--
 3 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 hosts/athame/nixos/postgres.nix

diff --git a/hosts/athame/nixos/default.nix b/hosts/athame/nixos/default.nix
index e1320095..8eea1d64 100644
--- a/hosts/athame/nixos/default.nix
+++ b/hosts/athame/nixos/default.nix
@@ -1,15 +1,17 @@
 { config, lib, pkgs, profiles, ... }:
 
+with lib;
+
 {
   imports = [
     ./hw.nix
     # profiles
     profiles.kat
     # host-specific services 
-    ./postgres.nix
     ./virtualhosts.nix
-    ./fail2ban.nix
-    # services 
+    # services
+    ../../../services/fail2ban.nix
+    ../../../services/postgres.nix
     ../../../services/nginx.nix
     ../../../services/mail.nix
     ../../../services/asterisk.nix
diff --git a/hosts/athame/nixos/postgres.nix b/hosts/athame/nixos/postgres.nix
deleted file mode 100644
index 3a36cd3c..00000000
--- a/hosts/athame/nixos/postgres.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.postgresql.enable = true;
-  services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
-    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
-    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
-    TEMPLATE template0
-    LC_COLLATE = "C"
-    LC_CTYPE = "C";
-  '';
-  services.postgresql.ensureDatabases = [ "nextcloud" ];
-  services.postgresql.ensureUsers = [{
-    name = "nextcloud";
-    ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
-  }];
-}
diff --git a/services/matrix.nix b/services/matrix.nix
index eef6af1b..1988b8e3 100644
--- a/services/matrix.nix
+++ b/services/matrix.nix
@@ -1,8 +1,15 @@
 { config, pkgs, witch, ... }:
 
 {
-  environment.systemPackages =
-    [ pkgs.arc.pkgs.mx-puppet-discord pkgs.mautrix-whatsapp ];
+  environment.systemPackages = [ pkgs.mx-puppet-discord pkgs.mautrix-whatsapp ];
+
+  services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
+    CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+    CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+    TEMPLATE template0
+    LC_COLLATE = "C"
+    LC_CTYPE = "C";
+  '';
 
   services.matrix-synapse = {
     enable = true;