diff options
| author | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-06-06 19:15:44 +0200 |
| commit | 74058abe0b5da0753c2167d6bab29eb1eae88366 (patch) | |
| tree | 748e9e75c0498161629597f7469933e69303168b /makefu/2configs/deployment | |
| parent | 88a845f7a1a037bf6bcf23863d41f36c4cedcd7e (diff) | |
| parent | a5bc9126db72f59062ff9d6a72b2fa35437b42cb (diff) | |
Merge branch '21.05'
Diffstat (limited to 'makefu/2configs/deployment')
| -rw-r--r-- | makefu/2configs/deployment/owncloud.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/deployment/rss.euer.krebsco.de.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index 86bd4b524..0593cf7fc 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -75,7 +75,7 @@ in { }; }; services.redis.enable = true; - systemd.services.redis.serviceConfig.LimitNOFILE=65536; + systemd.services.redis.serviceConfig.LimitNOFILE=mkForce "65536"; services.postgresql = { enable = true; # Ensure the database, user, and permissions always exist diff --git a/makefu/2configs/deployment/rss.euer.krebsco.de.nix b/makefu/2configs/deployment/rss.euer.krebsco.de.nix index a7ada9395..098ffcdd5 100644 --- a/makefu/2configs/deployment/rss.euer.krebsco.de.nix +++ b/makefu/2configs/deployment/rss.euer.krebsco.de.nix @@ -7,6 +7,11 @@ in { virtualHost = fqdn; selfUrlPath = "https://${fqdn}"; }; + + nixpkgs.config.permittedInsecurePackages = [ + "python2.7-Pillow-6.2.2" + ]; + 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.postgresqlBackup.location ]; |