flake.lock

@@ -380,11 +380,11 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1720263046,
-        "narHash": "sha256-6tJLK4EtB4IXBO4i6P/Ulf03Bd7GaEezT7AebN3VPHA=",
+        "lastModified": 1719686367,
+        "narHash": "sha256-zQ/Mgrg3GjE4QkweXPLAtbO8SnfzTXZrqmm8oZwXBV4=",
         "ref": "refs/heads/master",
-        "rev": "33d677fea187322e503f8a56d9c75ff7e7df057c",
-        "revCount": 151,
+        "rev": "eb8d568c7e30a8c45148fa5c235ebd49bc8effee",
+        "revCount": 148,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },

hosts/common/optional/docker/default.nix

@@ -1,11 +1,6 @@
-{ pkgs, inputs, ... }:
-{
+{ inputs, ... }: {
 
   imports = [ inputs.arion.nixosModules.arion ];
-  environment.systemPackages = [
-    pkgs.arion
-  ];
-
   # Arion works with Docker, but for NixOS-based containers, you need Podman
   # since NixOS 21.05.
   virtualisation = {
@@ -14,7 +9,6 @@
       defaultNetwork.settings.dns_enabled = true;
     };
     docker = {
-      enable = true;
       storageDriver = "btrfs";
       rootless = {
         enable = true;

hosts/common/optional/docker/postgres.nix

@@ -1,11 +1,5 @@
-{ pkgs, lib, inputs, config, ... }:
-let
-  admin_dbPasswordFile = lib.optionalString (lib.hasAttr "sops-nix" inputs) config.sops.secrets."software/postgres/admin_db/password".path;
-in
+{ pkgs, ... }:
 {
-  sops.secrets = {
-    "software/postgres/admin_db/password" = { };
-  };
   virtualisation.arion = {
     backend = "docker";
     projects = {
@@ -18,92 +12,51 @@ in
             RUN apt-get update \
                 && apt-get install -y --no-install-recommends \
                     postgresql-16-postgis \
-                    jq \
                 && rm -rf /var/lib/apt/lists/*
           ''}";
         environment = {
-          POSTGRES_PASSWORD_FILE = admin_dbPasswordFile;
+          POSTGRES_PASSWORD = "balls1234";
           POSTGRES_USER = "admin";
           POSTGRES_DB = "admin_db";
           PGDATA = "/var/lib/postgresql/data/pgdata";
-          POSTGRES_MULTIPLE_DATABASES = ''
-            [
-              {
-                "osm": {
-                  "user": "gis",
-                  "extensions": [
-                    "hstore",
-                    "postgis"
-                  ]
-                },
-                "bitcoin": {
-                  "user": "satoshi",
-                  "extensions": []
-                },
-                "btc_models": {
-                  "user": "dbt",
-                  "extensions": []
-                },
-                "dev_btc_models": {
-                  "user": "dbt",
-                  "extensions": []
-                }
-                "test": {
-                  "user": "test",
-                  "extensions": [hstore]
-                }
-              }
-            ]
-          '';
         };
         ports = [ "5432:5432" ];
         volumes = [
           "/mnt/postgres:/var/lib/postgresql/data"
 
-          # Need to mount secret file 
-          "${admin_dbPasswordFile}:${admin_dbPasswordFile}"
-
-          # PG init script to parse json specified in POSTGRES_MULTIPLE_DATABASES
-          # creates databases, users and installs extensions for each database.
+          # PG init script
           "${pkgs.writeScript "init.sh" ''
             #!/bin/bash
-            function create_user_and_database() {
-              local database=$1
-              local user=$2
-              local extensions=$3
-              echo "### admin user: $POSTGRES_USER ###"
-              echo "  Creating database '$database'"
-              echo "  Creating user  '$user'"
-              psql -v --username "$POSTGRES_USER" -d "$POSTGRES_DB" <<-EOSQL
-                  CREATE USER $user;
-                  CREATE DATABASE $database;
-                  GRANT ALL PRIVILEGES ON DATABASE $database TO $user;
+
+            # Create additional databases
+            psql -v --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+            	create database bitcoin;
+            	create database osm;
             EOSQL
-            
-            # Loop through extensions and create them
-            for ext in $(echo "$extensions" | tr ',' ' '); do
-              echo "     - Installing extention $ext"
-              psql -v --username "$POSTGRES_USER" -d "$database" -c "CREATE EXTENSION $ext;"
-            done
-            }
-            
-            if [ -n "$POSTGRES_MULTIPLE_DATABASES" ]; then
-            
-              # Parse the JSON string
-              database_names=$(echo "$POSTGRES_MULTIPLE_DATABASES" | jq -r '.[0] | keys[]')
-              echo "Multiple database creation requested: $(echo "$database_names" | tr "\n" " ")"
-              
-              # Loop through each database and create it
-              for db_name in $database_names; do
-                user=$(echo "$POSTGRES_MULTIPLE_DATABASES" | jq -r ".[0] | .''${db_name} | .user")
-                extensions=$(echo "$POSTGRES_MULTIPLE_DATABASES" | jq -r ".[0] | .''${db_name} | .extensions | join(\",\")")
-                create_user_and_database "$db_name" "$user" "$extensions"
-              done
-            fi
+
+            # Create additional users
+            psql -v --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+            	create user gis;
+            	create user satoshi;
+            EOSQL
+
+            # Setup bitcoin db
+            psql -v --username "$POSTGRES_USER" --dbname "bitcoin" <<-EOSQL
+            	grant all privileges on database bitcoin to satoshi;
+            EOSQL
+
+            # Setup osm db
+            psql -v --username "$POSTGRES_USER" --dbname "osm" <<-EOSQL
+              grant all privileges on database osm to gis;
+              create extension if not exists postgis;
+              create extension if not exists hstore;
+            EOSQL
+
            ''}:/docker-entrypoint-initdb.d/init.sh"
         ];
       };
     };
   };
+
 }