X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Feldiron.nix;h=5f0b5d5533ed3718218ff62bec9408c3ba1fd492;hb=5ccc61bb90f4e8959a0866c9ce2e711453d0fd9b;hp=289333534a4fbfab0facc833c1214bb9c84f73e1;hpb=439049e58f9638eefaf1648b1898fdb1d964d97e;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 2893335..5f0b5d5 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -1,3 +1,4 @@
+{ privateFiles ? ./. }:
 {
   network = {
     description = "Immae's network";
@@ -9,8 +10,10 @@
   {
     _module.args = {
       mylibs = import ../libs.nix;
+      mypkgs = import ../default.nix;
       myconfig = {
-        env = import ./environment.nix;
+        inherit privateFiles;
+        env = import "${privateFiles}/environment.nix";
         ips = {
           main = "176.9.151.89";
           production = "176.9.151.154";
@@ -23,9 +26,11 @@
       ./modules/certificates.nix
       ./modules/gitolite
       ./modules/databases
+      ./modules/mpd
       ./modules/websites
       ./modules/mail
       ./modules/ftp
+      ./modules/pub
     ];
     services.myGitolite.enable = true;
     services.myDatabases.enable = true;
@@ -33,7 +38,12 @@
     services.myWebsites.integration.enable = true;
     services.myWebsites.tools.enable = true;
     services.pure-ftpd.enable = true;
+    services.pub.enable = true;
 
+    services.journald.extraConfig = ''
+      MaxLevelStore="warning"
+      MaxRetentionSec="1year"
+      '';
     networking = {
       firewall = {
         enable = true;
@@ -96,9 +106,15 @@
       systemCronJobs = [
         ''
           # The star after /var/lib/* avoids deleting all folders in case of problem
-          0 3,9,15,21 * * * root rsync -e "ssh -i /root/.ssh/id_charon_vpn" -aAXvz --delete --numeric-ids --super --rsync-path="sudo rsync" /var/lib/* immae@immae.eu:
+          0 3,9,15,21 * * * root rsync -e "ssh -i /root/.ssh/id_charon_vpn" -aAXvz --delete --numeric-ids --super --rsync-path="sudo rsync" /var/lib/* immae@immae.eu: > /dev/null
         ''
       ];
     };
+
+    # This value determines the NixOS release with which your system is
+    # to be compatible, in order to avoid breaking some software such as
+    # database servers. You should change this only after NixOS release
+    # notes say you should.
+    system.stateVersion = "18.09"; # Did you read the comment?
   };
 }