Upgrade nixos and fix mediagoblin celeryd config

diff --git a/nix_path_env b/nix_path_env
index cfe37e6ddf3f4bc9e5c18258ffed9322a695fef0..901cd693d3bf9beb3baa8e16fc07b6ce2b8fbdee 100644 (file)
--- 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 a02af3840cc65aefc7774d0af2b72f1ed18613a6..2b56007de293a7d20f56b9dcf43d342fd0b06df4 100644 (file)
--- 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 = ''