diff options
| -rw-r--r-- | krebs/nixpkgs-unstable.json | 8 | ||||
| -rw-r--r-- | krebs/nixpkgs.json | 8 | ||||
| -rw-r--r-- | lass/1systems/neoprism/config.nix | 1 | ||||
| -rw-r--r-- | lass/2configs/gsm-wiki.nix | 26 |
4 files changed, 35 insertions, 8 deletions
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index e9dd5bf82..bd1ab98c0 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "555daa9d339b3df75e58ee558a4fec98ea92521e", - "date": "2023-04-18T16:34:17+02:00", - "path": "/nix/store/yfr0653m8j22871x11d363iz6wwsznsd-nixpkgs", - "sha256": "0m361xqnx1d1nwahichvg8l1qy3ambra0rg56mmyh71xgnrnz1m3", + "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", + "date": "2023-04-19T18:04:47+02:00", + "path": "/nix/store/jh86824939585dinrs1zlkh6cvz8l8l7-nixpkgs", + "sha256": "0kfndc7xdkm89yl0f27wdnwd6gdad3i49jx7gvaib1hz0ifpmxzv", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 8100f7ce9..7e478e9cf 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50", - "date": "2023-04-17T21:23:15+02:00", - "path": "/nix/store/fx4y582k55nd4qm9r7cl8gd5pzwx704k-nixpkgs", - "sha256": "02q34c1x6b1dmbshxfbk6nf3kr07lnmxn02j2lm2y0sbpjs939pd", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "date": "2023-04-22T11:27:49+08:00", + "path": "/nix/store/gpfv5hbki6g1b63nqw7md5bjlcpzsz1w-nixpkgs", + "sha256": "1fd7xyfna0klfbv37qq1ms2j4gzjpy14a8vbnw1i8ix6fijkywjf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/lass/1systems/neoprism/config.nix b/lass/1systems/neoprism/config.nix index cc08070af..7b402f8a6 100644 --- a/lass/1systems/neoprism/config.nix +++ b/lass/1systems/neoprism/config.nix @@ -4,6 +4,7 @@ imports = [ <stockholm/lass> <stockholm/lass/2configs/retiolum.nix> + <stockholm/lass/2configs/gsm-wiki.nix> # sync-containers <stockholm/lass/2configs/consul.nix> diff --git a/lass/2configs/gsm-wiki.nix b/lass/2configs/gsm-wiki.nix new file mode 100644 index 000000000..69508a155 --- /dev/null +++ b/lass/2configs/gsm-wiki.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, ... }: +{ + services.nginx.virtualHosts."docs.c3gsm.de" = { + forceSSL = true; + enableACME = true; + locations."/".extraConfig = '' + auth_basic "Restricted Content"; + auth_basic_user_file ${pkgs.writeText "flix-user-pass" '' + c3gsm:$apr1$q9OrPI4C$7AY4EIp3J2Xc4eLMbPGE21 + ''}; + root /srv/http/docs.c3gsm.de; + ''; + }; + + users.users.c3gsm-docs = { + isNormalUser = true; + home = "/srv/http/docs.c3gsm.de"; + createHome = true; + homeMode = "750"; + useDefaultShell = true; + group = "nginx"; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAlW1fvCrVXhVH/z76fXBWYR/qyecYTE9VOOkFLJ6OwG user@osmocom-dev" + ]; + }; +} |