summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs/deployment')
-rw-r--r--makefu/2configs/deployment/docker/archiveteam-warrior.nix2
-rw-r--r--makefu/2configs/deployment/owncloud.nix14
-rw-r--r--makefu/2configs/deployment/rss.euer.krebsco.de.nix8
3 files changed, 20 insertions, 4 deletions
diff --git a/makefu/2configs/deployment/docker/archiveteam-warrior.nix b/makefu/2configs/deployment/docker/archiveteam-warrior.nix
index 8eef27a20..0069e4530 100644
--- a/makefu/2configs/deployment/docker/archiveteam-warrior.nix
+++ b/makefu/2configs/deployment/docker/archiveteam-warrior.nix
@@ -21,7 +21,7 @@ in {
};
in
foldl' mergeAttrs {} (map proxy instances);
- docker-containers = let
+ virtualisation.oci-containers.containers = let
container = ident:
{ "archiveteam-warrior${toString ident}" = {
image = "archiveteam/warrior-dockerfile";
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index 571e56277..86bd4b524 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -36,10 +36,20 @@ in {
forceSSL = true;
enableACME = true;
};
- state = [ "${config.services.nextcloud.home}/config" ];
+ services.postgresqlBackup = {
+ enable = true;
+ databases = [ config.services.nextcloud.config.dbname ];
+ };
+
+ state = [
+ # services.postgresql.dataDir
+ # "${config.services.nextcloud.home}/config"
+ config.services.postgresqlBackup.location
+ ];
+
services.nextcloud = {
enable = true;
- package = pkgs.nextcloud20;
+ package = pkgs.nextcloud21;
hostName = "o.euer.krebsco.de";
# Use HTTPS for links
https = true;
diff --git a/makefu/2configs/deployment/rss.euer.krebsco.de.nix b/makefu/2configs/deployment/rss.euer.krebsco.de.nix
index 4be56f323..a7ada9395 100644
--- a/makefu/2configs/deployment/rss.euer.krebsco.de.nix
+++ b/makefu/2configs/deployment/rss.euer.krebsco.de.nix
@@ -9,7 +9,13 @@ in {
};
systemd.services.tt-rss.serviceConfig.ExecStart = lib.mkForce "${pkgs.php}/bin/php /var/lib/tt-rss/update_daemon2.php";
services.postgresql.package = pkgs.postgresql_9_6;
- state = [ config.services.postgresql.dataDir ];
+ state = [ config.services.postgresqlBackup.location ];
+
+ services.postgresqlBackup = {
+ enable = true;
+ databases = [ config.services.tt-rss.database.name ];
+ };
+
services.nginx.virtualHosts."${fqdn}" = {
enableACME = true;
forceSSL = true;