summaryrefslogtreecommitdiffstats
path: root/lass/1systems/prism.nix
diff options
context:
space:
mode:
Diffstat (limited to 'lass/1systems/prism.nix')
-rw-r--r--lass/1systems/prism.nix24
1 files changed, 19 insertions, 5 deletions
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index aa524720d..6ed80ac39 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -3,8 +3,9 @@
let
ip = config.krebs.build.host.nets.internet.ip4.addr;
- inherit (import ../../4lib { inherit lib pkgs; })
- manageCerts;
+ inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
+ manageCerts
+ ;
in {
imports = [
@@ -12,16 +13,19 @@ in {
../2configs/default.nix
../2configs/exim-smarthost.nix
../2configs/downloading.nix
- ../2configs/git.nix
../2configs/ts3.nix
../2configs/bitlbee.nix
../2configs/weechat.nix
../2configs/privoxy-retiolum.nix
../2configs/radio.nix
+ ../2configs/buildbot-standalone.nix
{
- #we need to use old sqlite for buildbot
imports = [
- ../2configs/buildbot-standalone.nix
+ ../2configs/git.nix
+ ( manageCerts [ "cgit.lassul.us" ])
+ ];
+ krebs.nginx.servers.cgit.server-names = [
+ "cgit.lassul.us"
];
}
{
@@ -196,6 +200,16 @@ in {
{ predicate = "-p tcp --dport xmpp-server"; target = "ACCEPT"; }
];
}
+ {
+ imports = [
+ ../2configs/realwallpaper-server.nix
+ ];
+ krebs.nginx.servers."lassul.us".locations = [
+ (lib.nameValuePair "/wallpaper.png" ''
+ alias /tmp/wallpaper.png;
+ '')
+ ];
+ }
];
krebs.build.host = config.krebs.hosts.prism;