diff --git a/machines/gerd.nix b/machines/gerd.nix index c1d5e14..b727eb1 100644 --- a/machines/gerd.nix +++ b/machines/gerd.nix @@ -6,6 +6,7 @@ ./../shared/applications/server/nginx.nix ./../shared/applications/server/postgresql.nix # INCLUDES DATABASE BACKUPS ./../shared/applications/server/restic.nix # EXTERNAL BACKUP + ./../shared/applications/server/podman.nix ./../shared/applications/state/postgresql.nix ./../shared/applications/state/ssh.nix @@ -28,6 +29,8 @@ ./gerd/services/matrix-synapse.nix ./gerd/services/uptime-kuma.nix + + ./gerd/services/rallly.nix ]; networking.hostName = "gerd"; diff --git a/secrets/default.nix b/secrets/default.nix index 312fecd..037c8cb 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -54,6 +54,10 @@ # uptime-kuma uptime-kuma-ldap-pass.file = ./uptime-kuma/ldap-pass.age; + + # rallly + rallly-ldap-pass.file = ./rallly/ldap-pass.age; + rallly-env.file = ./rallly/env.age; }; users.groups.secrets-lldap-bind-user-pass = {}; diff --git a/secrets/rallly/env.age b/secrets/rallly/env.age new file mode 100644 index 0000000..01d9b0d Binary files /dev/null and b/secrets/rallly/env.age differ diff --git a/secrets/rallly/ldap-pass.age b/secrets/rallly/ldap-pass.age new file mode 100644 index 0000000..d40f5da Binary files /dev/null and b/secrets/rallly/ldap-pass.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index c6a3edd..344d5d0 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -64,4 +64,8 @@ in # uptime-kuma "uptime-kuma/ldap-pass.age".publicKeys = defaultAccess; + + # rallly + "rallly/ldap-pass.age".publicKeys = defaultAccess; + "rallly/env.age".publicKeys = defaultAccess; } diff --git a/shared/applications/server/podman.nix b/shared/applications/server/podman.nix new file mode 100644 index 0000000..c982261 --- /dev/null +++ b/shared/applications/server/podman.nix @@ -0,0 +1,6 @@ +{ + virtualisation.podman = { + enable = true; + dockerCompat = true; + }; +} diff --git a/shared/sources/sources.json b/shared/sources/sources.json index b069312..a3f3b7f 100644 --- a/shared/sources/sources.json +++ b/shared/sources/sources.json @@ -41,10 +41,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", - "sha256": "09qy7zv80bkd9ighsw0bdxjq70dw3qjnyvg7il1fycrsgs5x1gan", + "rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4", + "sha256": "0fxw15gia9cc72spsqf1870bggp8gx694cr2g8hspm3jbj87xr0g", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5135c59491985879812717f4c9fea69604e7f26f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/6313551cd05425cd5b3e63fe47dbc324eabb15e4.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }