From 0f3009993afc4e88ff728226cf6edc15db3ab415 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 10 May 2019 01:27:29 +0200 Subject: [PATCH] Upgrade nixos and fix mediagoblin celeryd config --- nix_path_env | 2 +- nixops/modules/websites/tools/mediagoblin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 = '' -- 2.41.0