aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-10 01:27:29 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-10 01:27:29 +0200
commit0f3009993afc4e88ff728226cf6edc15db3ab415 (patch)
tree2ce2a6fe00e2b222b467b706b5b716d305bbbe95
parent2977fd8fdfc55dd42837e3dd56c77d36097ef607 (diff)
downloadNix-0f3009993afc4e88ff728226cf6edc15db3ab415.tar.gz
Nix-0f3009993afc4e88ff728226cf6edc15db3ab415.tar.zst
Nix-0f3009993afc4e88ff728226cf6edc15db3ab415.zip
Upgrade nixos and fix mediagoblin celeryd config
-rw-r--r--nix_path_env2
-rw-r--r--nixops/modules/websites/tools/mediagoblin.nix2
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
4 # This will automatically upgrade to latest version at each build 4 # This will automatically upgrade to latest version at each build
5 nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz" 5 nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
6else 6else
7 nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172462.04954e39df8/nixexprs.tar.xz" 7 nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172530.096e2f137b6/nixexprs.tar.xz"
8fi 8fi
9nixpkgsPrevious="$nixpkgs" 9nixpkgsPrevious="$nixpkgs"
10nixpkgsNext="$nixpkgs" 10nixpkgsNext="$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 {
174 wantedBy = [ "multi-user.target" ]; 174 wantedBy = [ "multi-user.target" ];
175 after = [ "network.target" "mediagoblin-web.service" ]; 175 after = [ "network.target" "mediagoblin-web.service" ];
176 176
177 environment.MEDIAGOBLIN_CONFIG = "${pythonRoot}/mediagoblin_local.ini"; 177 environment.MEDIAGOBLIN_CONFIG = mediagoblin_init;
178 environment.CELERY_CONFIG_MODULE = "mediagoblin.init.celery.from_celery"; 178 environment.CELERY_CONFIG_MODULE = "mediagoblin.init.celery.from_celery";
179 179
180 script = '' 180 script = ''