diff options
| author | nin <nin@c-base.org> | 2018-01-30 23:06:17 +0100 |
|---|---|---|
| committer | nin <nin@c-base.org> | 2018-01-30 23:06:17 +0100 |
| commit | 6849d7aa4810d5f1f2ec55d852d21812dd1b8002 (patch) | |
| tree | b2b236981d6cb2d226fbe239845838a15c22b30e /makefu/2configs | |
| parent | 80c2e23ec028bfda5c0bad0e3269648d34d298b0 (diff) | |
| parent | ffc294575cb59585c3bfb6b85fa45fb69cdf1d41 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/deployment/photostore.krebsco.de.nix | 18 | ||||
| -rw-r--r-- | makefu/2configs/git/cgit-retiolum.nix | 9 | ||||
| -rw-r--r-- | makefu/2configs/hw/stk1160.nix | 13 |
3 files changed, 23 insertions, 17 deletions
diff --git a/makefu/2configs/deployment/photostore.krebsco.de.nix b/makefu/2configs/deployment/photostore.krebsco.de.nix index 9e16a384a..ecbca9ea3 100644 --- a/makefu/2configs/deployment/photostore.krebsco.de.nix +++ b/makefu/2configs/deployment/photostore.krebsco.de.nix @@ -26,14 +26,16 @@ in { services.nginx = { enable = mkDefault true; virtualHosts."photostore.krebsco.de" = { - locations = { - "/".extraConfig = '' - uwsgi_pass unix://${wsgi-sock}; - uwsgi_param UWSGI_CHDIR ${workdir}; - uwsgi_param UWSGI_MODULE cuserver.main; - uwsgi_param UWSGI_CALLABLE app; - include ${pkgs.nginx}/conf/uwsgi_params; - ''; + enableACME = true; + forceSSL = true; + locations = { + "/".extraConfig = '' + uwsgi_pass unix://${wsgi-sock}; + uwsgi_param UWSGI_CHDIR ${workdir}; + uwsgi_param UWSGI_MODULE cuserver.main; + uwsgi_param UWSGI_CALLABLE app; + include ${pkgs.nginx}/conf/uwsgi_params; + ''; }; }; }; diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index da246f66a..eacbd99cf 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -53,15 +53,6 @@ let make-krebs-repo = with git; name: { cgit ? {}, ... }: { inherit cgit name; public = true; - hooks = { - post-receive = pkgs.git-hooks.irc-announce { - nick = config.networking.hostName; - verbose = config.krebs.build.host.name == "gum"; - channel = "#xxx"; - # TODO remove the hardcoded hostname - server = "irc.r"; - }; - }; }; diff --git a/makefu/2configs/hw/stk1160.nix b/makefu/2configs/hw/stk1160.nix new file mode 100644 index 000000000..4ac639a25 --- /dev/null +++ b/makefu/2configs/hw/stk1160.nix @@ -0,0 +1,13 @@ +{ pkgs, lib, ... }: +{ + # TODO: un-pin linuxPackages somehow + nixpkgs.config.packageOverrides = pkgs: { + linux_4_14 = pkgs.linux_4_14.override { + extraConfig = '' + MEDIA_ANALOG_TV_SUPPORT y + VIDEO_STK1160_COMMON m + VIDEO_STK1160 m + ''; + }; + }; +} |