From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Thu, 9 May 2019 23:27:29 +0000 (+0200)
Subject: Upgrade nixos and fix mediagoblin celeryd config
X-Git-Tag: nur_publish~44
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=sidebyside;h=0f3009993afc4e88ff728226cf6edc15db3ab415;p=perso%2FImmae%2FConfig%2FNix.git

Upgrade nixos and fix mediagoblin celeryd config
---

diff --git a/nix_path_env b/nix_path_env
index cfe37e6..901cd69 100644
--- a/nix_path_env
+++ b/nix_path_env
@@ -4,7 +4,7 @@ if [ -z "$NIXOPS_DEPLOYMENT" ]; then
   # This will automatically upgrade to latest version at each build
   nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
 else
-  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172462.04954e39df8/nixexprs.tar.xz"
+  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172530.096e2f137b6/nixexprs.tar.xz"
 fi
 nixpkgsPrevious="$nixpkgs"
 nixpkgsNext="$nixpkgs"
diff --git a/nixops/modules/websites/tools/mediagoblin.nix b/nixops/modules/websites/tools/mediagoblin.nix
index a02af38..2b56007 100644
--- a/nixops/modules/websites/tools/mediagoblin.nix
+++ b/nixops/modules/websites/tools/mediagoblin.nix
@@ -174,7 +174,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "mediagoblin-web.service" ];
 
-      environment.MEDIAGOBLIN_CONFIG = "${pythonRoot}/mediagoblin_local.ini";
+      environment.MEDIAGOBLIN_CONFIG = mediagoblin_init;
       environment.CELERY_CONFIG_MODULE = "mediagoblin.init.celery.from_celery";
 
       script = ''