diff options
| -rw-r--r-- | config.nix | 3 | ||||
| -rw-r--r-- | default.nix | 17 | ||||
| -rw-r--r-- | srv/default.nix | 11 |
3 files changed, 4 insertions, 27 deletions
@@ -8,7 +8,4 @@ mlPublicURL = "http://localhost:4000"; listenProto = "tcp"; listenAddr = ":4000"; - - # If empty then a derived static directory is used - staticProxyURL = "http://127.0.0.1:4002"; } diff --git a/default.nix b/default.nix index 8d20c38..93ba9d8 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ }) {}, baseConfig ? import ./config.nix, - baseSkipServices ? [], + skipServices ? [], }: rec { @@ -17,12 +17,6 @@ redisListenPath = "${config.runDir}/redis"; }; - skipServices = baseSkipServices ++ ( - if baseConfig.staticProxyURL == "" - then [ "static" ] - else [] - ); - static = (import ./static) { inherit pkgs; }; srv = pkgs.callPackage (import ./srv) { @@ -59,13 +53,6 @@ numprocesses = 1 ''; - staticCircusCfg = '' - [watcher:static] - cmd = ${static.serve}/bin/static-serve - numprocesses = 1 - working_dir = ./static - ''; - circusCfg = pkgs.writeText "mediocre-blog-circusCfg" '' [circus] endpoint = tcp://127.0.0.1:0 @@ -74,8 +61,6 @@ ${if (!builtins.elem "srv" skipServices) then srvCircusCfg else ""} ${if (!builtins.elem "redis" skipServices) then redisCircusCfg else ""} - - ${if (!builtins.elem "static" skipServices) then staticCircusCfg else ""} ''; entrypoint = pkgs.writeScript "mediocre-blog-entrypoint" '' diff --git a/srv/default.nix b/srv/default.nix index df54d84..42018ce 100644 --- a/srv/default.nix +++ b/srv/default.nix @@ -13,7 +13,6 @@ init = writeText "mediocre-blog-srv-init" '' export MEDIOCRE_BLOG_DATA_DIR="${config.dataDir}" - mkdir -p "${config.dataDir}" # mailing list export MEDIOCRE_BLOG_ML_SMTP_ADDR="${config.mlSMTPAddr}" @@ -28,11 +27,7 @@ export MEDIOCRE_BLOG_POW_SECRET="${config.powSecret}" # static proxy - if [ "${config.staticProxyURL}" == "" ]; then - export MEDIOCRE_BLOG_STATIC_DIR="${staticBuild}" - else - export MEDIOCRE_BLOG_STATIC_URL="${config.staticProxyURL}" - fi + export MEDIOCRE_BLOG_STATIC_DIR="${staticBuild}" # listening export MEDIOCRE_BLOG_LISTEN_PROTO="${config.listenProto}" @@ -43,14 +38,14 @@ pname = "mediocre-blog-srv"; version = "dev"; src = ./src; - vendorSha256 = "sha256-/F62WVkI50woo5J0xZOAn0g0WWkDna4wIBeVvbhAGzs="; + vendorSha256 = "sha256-MdjPrNSAAiqkAnJRIhMFTVQDKIPuDCHqRQFEtnoe1Cc="; # disable tests checkPhase = ''''; }; bin = writeScript "mediocre-blog-srv-bin" '' - #!${bash} + #!${bash}/bin/bash source ${init} exec ${build}/bin/mediocre-blog ''; |