diff --git a/conf b/conf index a73e58a..4b80885 100755 --- a/conf +++ b/conf @@ -11,7 +11,7 @@ local) eval ${@:2} ;; remote) - export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/$2/configuration.nix:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix:muflax-blog=./vendor/muflax-blog + export NIX_PATH="nixpkgs=https://nixos.org/channels/nixos-16.09/nixexprs.tar.xz:nixos-config=`pwd`/$2/configuration.nix:ssh-id-file=`pwd`/deploy_key":secrets=`pwd`/secrets.nix eval ${@:3} ;; local-deploy) diff --git a/modules/muflax-blog.nix b/modules/muflax-blog.nix index 289cd4e..14f1553 100644 --- a/modules/muflax-blog.nix +++ b/modules/muflax-blog.nix @@ -3,7 +3,13 @@ let cfg = config.services.muflax-blog; - blog = lib.overrideDerivation (pkgs.callPackage {}) (default: { + muflax-source = pkgs.fetchFromGitHub { + rev = "e5ce7ae4296c6605a7e886c153d569fc38318096"; + owner = "fmap"; + repo = "muflax65ngodyewp.onion"; + sha256 = "10n5km8mr7vjqlyb46drfhwzlrwranqaxpqc53a2hk9pqqckm8cx"; + }; + blog = lib.overrideDerivation (pkgs.callPackage "${muflax-source}/maintenance" {}) (default: { buildPhase = default.buildPhase + "\n" + '' grep -lr '[^@]muflax.com' out | xargs -r sed -i 's/\([^@]\)muflax.com/\1${cfg.hidden-service.hostname}/g' ''; diff --git a/vendor/muflax-blog b/vendor/muflax-blog deleted file mode 160000 index e5ce7ae..0000000 --- a/vendor/muflax-blog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5ce7ae4296c6605a7e886c153d569fc38318096