diff options
author | stuebinm | 2022-01-18 09:43:24 +0100 |
---|---|---|
committer | stuebinm | 2022-01-20 13:19:44 +0100 |
commit | 0bcabe1c4b1dd74af233674dfa6c6ec3011ce2c0 (patch) | |
tree | 5c58943f99245ff7f745f50b46c34ae288c3e503 | |
parent | db83a406bc6e63289e47ff5d2228c08430832655 (diff) |
restructuring directories
Diffstat (limited to '')
-rw-r--r-- | abbenay/configuration.nix (renamed from hosts/abbenay/configuration.nix) | 0 | ||||
-rw-r--r-- | abbenay/hardware-configuration.nix (renamed from hosts/abbenay/hardware-configuration.nix) | 0 | ||||
-rw-r--r-- | chaski/configuration.nix (renamed from hosts/chaski/configuration.nix) | 2 | ||||
-rw-r--r-- | chaski/hardware-configuration.nix (renamed from hosts/chaski/hardware-configuration.nix) | 0 | ||||
-rw-r--r-- | chaski/ilztal.live/geolocation/index.html (renamed from assets/ilztal.live/geolocation/index.html) | 0 | ||||
-rw-r--r-- | chaski/ilztal.live/geolocation/mapview.html (renamed from assets/ilztal.live/geolocation/mapview.html) | 0 | ||||
-rw-r--r-- | chaski/ilztal.live/geolocation/view.html (renamed from assets/ilztal.live/geolocation/view.html) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/.gitignore (renamed from hosts/chaski/services/VaaS/.gitignore) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/CHANGELOG.md (renamed from hosts/chaski/services/VaaS/CHANGELOG.md) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/app/Main.hs (renamed from hosts/chaski/services/VaaS/app/Main.hs) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/default.nix (renamed from hosts/chaski/services/VaaS/default.nix) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/haskell.cabal (renamed from hosts/chaski/services/VaaS/haskell.cabal) | 0 | ||||
-rw-r--r-- | chaski/services/VaaS/index.html (renamed from hosts/chaski/services/VaaS/index.html) | 0 | ||||
-rw-r--r-- | chaski/services/geolocation.nix (renamed from hosts/chaski/services/geolocation.nix) | 2 | ||||
-rw-r--r-- | chaski/services/gtfs.nix (renamed from hosts/chaski/services/gtfs.nix) | 0 | ||||
-rw-r--r-- | chaski/services/jitsi.nix (renamed from hosts/chaski/services/jitsi.nix) | 0 | ||||
-rw-r--r-- | chaski/services/uplcg.nix (renamed from hosts/chaski/services/uplcg.nix) | 0 | ||||
-rw-r--r-- | chaski/services/woitb.nix (renamed from hosts/chaski/services/woitb.nix) | 0 | ||||
-rw-r--r-- | chaski/services/woitb/index.html (renamed from hosts/chaski/services/woitb/index.html) | 0 | ||||
-rw-r--r-- | chaski/services/woitb/info.html (renamed from hosts/chaski/services/woitb/info.html) | 0 | ||||
-rw-r--r-- | cyberbox/configuration.nix (renamed from hosts/cyberbox/configuration.nix) | 0 | ||||
-rw-r--r-- | cyberbox/hardware-configuration.nix (renamed from hosts/cyberbox/hardware-configuration.nix) | 0 | ||||
-rw-r--r-- | flake.nix | 8 | ||||
-rw-r--r-- | flora/configuration.nix (renamed from hosts/flora/configuration.nix) | 0 | ||||
-rw-r--r-- | flora/hardware-configuration.nix (renamed from hosts/flora/hardware-configuration.nix) | 0 | ||||
-rw-r--r-- | flora/services/blog.nix (renamed from hosts/flora/services/blog.nix) | 0 | ||||
-rw-r--r-- | flora/services/cgit.nix (renamed from hosts/flora/services/cgit.nix) | 0 | ||||
-rw-r--r-- | flora/services/daemoniones.nix (renamed from hosts/flora/services/daemoniones.nix) | 0 | ||||
-rw-r--r-- | flora/services/dockerhub.nix (renamed from hosts/flora/services/dockerhub.nix) | 0 | ||||
-rw-r--r-- | flora/services/hedgedoc.nix (renamed from hosts/flora/services/hedgedoc.nix) | 0 | ||||
-rw-r--r-- | flora/services/nginx.nix (renamed from hosts/flora/services/nginx.nix) | 0 | ||||
-rw-r--r-- | flora/services/picarones.nix (renamed from hosts/flora/services/picarones.nix) | 0 | ||||
-rw-r--r-- | flora/services/pleroma.nix (renamed from hosts/flora/services/pleroma.nix) | 0 | ||||
-rw-r--r-- | flora/services/surveys.nix (renamed from hosts/flora/services/surveys.nix) | 0 | ||||
-rw-r--r-- | hosts/chaski/services/exneuland.nix | 58 | ||||
-rw-r--r-- | hosts/chaski/services/workadventure.nix | 93 | ||||
-rw-r--r-- | pkgs/default.nix | 17 | ||||
-rw-r--r-- | pkgs/exneuland.nix | 32 |
38 files changed, 5 insertions, 207 deletions
diff --git a/hosts/abbenay/configuration.nix b/abbenay/configuration.nix index 2aabaa7..2aabaa7 100644 --- a/hosts/abbenay/configuration.nix +++ b/abbenay/configuration.nix diff --git a/hosts/abbenay/hardware-configuration.nix b/abbenay/hardware-configuration.nix index 876431d..876431d 100644 --- a/hosts/abbenay/hardware-configuration.nix +++ b/abbenay/hardware-configuration.nix diff --git a/hosts/chaski/configuration.nix b/chaski/configuration.nix index ae422cf..fa51fdf 100644 --- a/hosts/chaski/configuration.nix +++ b/chaski/configuration.nix @@ -8,8 +8,6 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - # ./services/workadventure.nix - #./services/exneuland.nix # ./services/jitsi.nix ./services/uplcg.nix ./services/woitb.nix diff --git a/hosts/chaski/hardware-configuration.nix b/chaski/hardware-configuration.nix index 54fbcba..54fbcba 100644 --- a/hosts/chaski/hardware-configuration.nix +++ b/chaski/hardware-configuration.nix diff --git a/assets/ilztal.live/geolocation/index.html b/chaski/ilztal.live/geolocation/index.html index 052a9fa..052a9fa 100644 --- a/assets/ilztal.live/geolocation/index.html +++ b/chaski/ilztal.live/geolocation/index.html diff --git a/assets/ilztal.live/geolocation/mapview.html b/chaski/ilztal.live/geolocation/mapview.html index bb62f62..bb62f62 100644 --- a/assets/ilztal.live/geolocation/mapview.html +++ b/chaski/ilztal.live/geolocation/mapview.html diff --git a/assets/ilztal.live/geolocation/view.html b/chaski/ilztal.live/geolocation/view.html index 58b4c76..58b4c76 100644 --- a/assets/ilztal.live/geolocation/view.html +++ b/chaski/ilztal.live/geolocation/view.html diff --git a/hosts/chaski/services/VaaS/.gitignore b/chaski/services/VaaS/.gitignore index b5e3679..b5e3679 100644 --- a/hosts/chaski/services/VaaS/.gitignore +++ b/chaski/services/VaaS/.gitignore diff --git a/hosts/chaski/services/VaaS/CHANGELOG.md b/chaski/services/VaaS/CHANGELOG.md index 500a0d0..500a0d0 100644 --- a/hosts/chaski/services/VaaS/CHANGELOG.md +++ b/chaski/services/VaaS/CHANGELOG.md diff --git a/hosts/chaski/services/VaaS/app/Main.hs b/chaski/services/VaaS/app/Main.hs index b5697d7..b5697d7 100644 --- a/hosts/chaski/services/VaaS/app/Main.hs +++ b/chaski/services/VaaS/app/Main.hs diff --git a/hosts/chaski/services/VaaS/default.nix b/chaski/services/VaaS/default.nix index 427270c..427270c 100644 --- a/hosts/chaski/services/VaaS/default.nix +++ b/chaski/services/VaaS/default.nix diff --git a/hosts/chaski/services/VaaS/haskell.cabal b/chaski/services/VaaS/haskell.cabal index 262b65f..262b65f 100644 --- a/hosts/chaski/services/VaaS/haskell.cabal +++ b/chaski/services/VaaS/haskell.cabal diff --git a/hosts/chaski/services/VaaS/index.html b/chaski/services/VaaS/index.html index a7f59e0..a7f59e0 100644 --- a/hosts/chaski/services/VaaS/index.html +++ b/chaski/services/VaaS/index.html diff --git a/hosts/chaski/services/geolocation.nix b/chaski/services/geolocation.nix index 4b095bd..9fe0973 100644 --- a/hosts/chaski/services/geolocation.nix +++ b/chaski/services/geolocation.nix @@ -2,5 +2,5 @@ { services.nginx.virtualHosts."ilztal.live".locations."/geolocation".root = - ../../../assets/ilztal.live; + ../ilztal.live; } diff --git a/hosts/chaski/services/gtfs.nix b/chaski/services/gtfs.nix index 61837a1..61837a1 100644 --- a/hosts/chaski/services/gtfs.nix +++ b/chaski/services/gtfs.nix diff --git a/hosts/chaski/services/jitsi.nix b/chaski/services/jitsi.nix index d6f398b..d6f398b 100644 --- a/hosts/chaski/services/jitsi.nix +++ b/chaski/services/jitsi.nix diff --git a/hosts/chaski/services/uplcg.nix b/chaski/services/uplcg.nix index 5605046..5605046 100644 --- a/hosts/chaski/services/uplcg.nix +++ b/chaski/services/uplcg.nix diff --git a/hosts/chaski/services/woitb.nix b/chaski/services/woitb.nix index 0c50617..0c50617 100644 --- a/hosts/chaski/services/woitb.nix +++ b/chaski/services/woitb.nix diff --git a/hosts/chaski/services/woitb/index.html b/chaski/services/woitb/index.html index 8d08826..8d08826 100644 --- a/hosts/chaski/services/woitb/index.html +++ b/chaski/services/woitb/index.html diff --git a/hosts/chaski/services/woitb/info.html b/chaski/services/woitb/info.html index e68d728..e68d728 100644 --- a/hosts/chaski/services/woitb/info.html +++ b/chaski/services/woitb/info.html diff --git a/hosts/cyberbox/configuration.nix b/cyberbox/configuration.nix index 47ffaad..47ffaad 100644 --- a/hosts/cyberbox/configuration.nix +++ b/cyberbox/configuration.nix diff --git a/hosts/cyberbox/hardware-configuration.nix b/cyberbox/hardware-configuration.nix index a724f02..a724f02 100644 --- a/hosts/cyberbox/hardware-configuration.nix +++ b/cyberbox/hardware-configuration.nix @@ -43,10 +43,10 @@ in { nixosConfigurations = { - chaski = mkServer ./hosts/chaski/configuration.nix; - flora = mkServer ./hosts/flora/configuration.nix; - abbenay = mkDesktop ./hosts/abbenay/configuration.nix; - cyberbox = mkDesktop ./hosts/cyberbox/configuration.nix; + chaski = mkServer ./chaski/configuration.nix; + flora = mkServer ./flora/configuration.nix; + abbenay = mkDesktop ./abbenay/configuration.nix; + cyberbox = mkDesktop ./cyberbox/configuration.nix; }; homeConfigurations.stuebinm = diff --git a/hosts/flora/configuration.nix b/flora/configuration.nix index b2699b7..b2699b7 100644 --- a/hosts/flora/configuration.nix +++ b/flora/configuration.nix diff --git a/hosts/flora/hardware-configuration.nix b/flora/hardware-configuration.nix index 2ce21f4..2ce21f4 100644 --- a/hosts/flora/hardware-configuration.nix +++ b/flora/hardware-configuration.nix diff --git a/hosts/flora/services/blog.nix b/flora/services/blog.nix index 056a63b..056a63b 100644 --- a/hosts/flora/services/blog.nix +++ b/flora/services/blog.nix diff --git a/hosts/flora/services/cgit.nix b/flora/services/cgit.nix index 094bfd5..094bfd5 100644 --- a/hosts/flora/services/cgit.nix +++ b/flora/services/cgit.nix diff --git a/hosts/flora/services/daemoniones.nix b/flora/services/daemoniones.nix index ae9d3cb..ae9d3cb 100644 --- a/hosts/flora/services/daemoniones.nix +++ b/flora/services/daemoniones.nix diff --git a/hosts/flora/services/dockerhub.nix b/flora/services/dockerhub.nix index c9b84b3..c9b84b3 100644 --- a/hosts/flora/services/dockerhub.nix +++ b/flora/services/dockerhub.nix diff --git a/hosts/flora/services/hedgedoc.nix b/flora/services/hedgedoc.nix index 038f99f..038f99f 100644 --- a/hosts/flora/services/hedgedoc.nix +++ b/flora/services/hedgedoc.nix diff --git a/hosts/flora/services/nginx.nix b/flora/services/nginx.nix index bbcacb7..bbcacb7 100644 --- a/hosts/flora/services/nginx.nix +++ b/flora/services/nginx.nix diff --git a/hosts/flora/services/picarones.nix b/flora/services/picarones.nix index c2e3c7b..c2e3c7b 100644 --- a/hosts/flora/services/picarones.nix +++ b/flora/services/picarones.nix diff --git a/hosts/flora/services/pleroma.nix b/flora/services/pleroma.nix index e0f60ed..e0f60ed 100644 --- a/hosts/flora/services/pleroma.nix +++ b/flora/services/pleroma.nix diff --git a/hosts/flora/services/surveys.nix b/flora/services/surveys.nix index befa673..befa673 100644 --- a/hosts/flora/services/surveys.nix +++ b/flora/services/surveys.nix diff --git a/hosts/chaski/services/exneuland.nix b/hosts/chaski/services/exneuland.nix deleted file mode 100644 index 3ec3451..0000000 --- a/hosts/chaski/services/exneuland.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - workadventure-nix = builtins.fetchGit { - url = "https://stuebinm.eu/git/workadventure-nix"; - ref = "master"; - }; - wapkgs = import "${workadventure-nix.outPath}/wapkgs.nix" { - inherit pkgs; - lib = pkgs.lib; - }; - frontdrv = wapkgs.workadventure-tcm.front.override { - environment = { - PUSHER_URL = "https://exneuland.stuebinm.eu/pusher"; - START_ROOM_URL = "/_/global/world.di.c3voc.de/maps/main.json"; - }; - }; - exneuland = import ../../../pkgs/exneuland.nix; -in -{ - services.nginx = { - enable = true; - recommendedProxySettings = false; - virtualHosts."exneuland.stuebinm.eu" = { - root = "${frontdrv}/dist"; - locations."/_/".tryFiles = "/index.html =404"; - - locations."/pusher" = { - proxyPass = "http://localhost:4000"; - proxyWebsockets = true; - extraConfig = '' - add_header Access-Control-Allow-Origin https://exneuland.stuebinm.eu; - proxy_pass_request_headers on; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Host $http_host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $http_connection; - ''; - }; - - enableACME = true; - forceSSL = true; - }; - }; - - systemd.services.exneuland = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - description = "exneuland backend for workadventure"; - serviceConfig = { - ExecStart = "${exneuland}/bin/exneuland start"; - Restart = "always"; - }; - }; -} diff --git a/hosts/chaski/services/workadventure.nix b/hosts/chaski/services/workadventure.nix deleted file mode 100644 index c2b704f..0000000 --- a/hosts/chaski/services/workadventure.nix +++ /dev/null @@ -1,93 +0,0 @@ -{pkgs, lib, config, ...}: - -let - sources = import ../../../nix/sources.nix {}; - # why the double outPath? Dunno, just niv things … - workadventure-nix = sources.workadventure.outPath.outPath; - packageset = ( - import "${workadventure-nix}/wapkgs.nix" { - inherit pkgs lib; - } - ).workadventure-xce; -in -{ - # not the most intuitive of container names, but "workadventure" is too long - containers.wa-space = { - - # we'll need the outer config to get the turn secret inside the container, - # and I'm feeling haskelly so config' it is! - config = let config' = config; in {config, pkgs, ...}: { - imports = [ workadventure-nix ]; - networking.firewall.allowedTCPPorts = [ 80 ]; - - services.workadventure."space.stuebinm.eu" = { - inherit packageset; - - nginx = { - default = true; - domain = "space.stuebinm.eu"; - maps.serve = true; - maps.path = "/workadventuremaps/"; - }; - - frontend.startRoomUrl = "/_/global/space.stuebinm.eu/maps/Floor0/floor0.json"; - - commonConfig = { - webrtc.stun.url = "stun:space.stuebinm.eu:3478"; - webrtc.turn = { - url = "turn:95.217.159.23"; - user = "turn"; - password = config'.services.coturn.static-auth-secret; - }; - jitsi.url = "meet.ffmuc.net"; - }; - }; - }; - - privateNetwork = true; - hostAddress6 = "fd00::42:14"; - localAddress6 = "fd00::42:16"; - - autoStart = true; - - }; - - services.coturn = { - enable = true; - realm = "turn.hacc.space"; - # this is a static "secret" that is also compiled into workadventure, - # so it seems ok to put it into the nix store - static-auth-secret = "1c496cea367f9608c77a754c1ef78079a512e013"; - use-auth-secret = true; - no-cli = true; - no-tcp-relay = true; - - cert = config.security.acme.certs."space.stuebinm.eu".directory + "full.pem"; - pkey = config.security.acme.certs."space.stuebinm.eu".directory + "key.pem"; - }; - - - services.nginx = { - virtualHosts."space.stuebinm.eu" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://[${config.containers.wa-space.localAddress6}]"; - proxyWebsockets = true; - }; - }; - }; - - - networking.firewall = with config.services.coturn; - let - ports = [ listening-port tls-listening-port ]; - in { - allowedTCPPorts = [ 80 ] ++ ports; - allowedUDPPorts = ports; - allowedUDPPortRanges = [ - { from = min-port; to = max-port; } - ]; - }; - -} diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 0017eda..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: - -let - sources = import ../nix/sources.nix; - pkgs = import sources.nixpkgs {}; - - callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); - - newpkgs = { -# dendrite = callPackage "${sources.nixchen}/pkgs/dendrite" {}; - - inherit callPackage; - appendOverlays = overlays: (pkgs.appendOverlays overlays) // newpkgs; - }; - -in pkgs // newpkgs - diff --git a/pkgs/exneuland.nix b/pkgs/exneuland.nix deleted file mode 100644 index 9cd4c71..0000000 --- a/pkgs/exneuland.nix +++ /dev/null @@ -1,32 +0,0 @@ -let - sources = import ../nix/sources.nix {}; -in - -with import sources.nixpkgs {}; - -let - packages = beam.packagesWith beam.interpreters.erlang; - src = fetchFromGitLab { - owner = "hexchen"; - repo = "exneuland"; - rev = "main"; - sha256 = "0zh1vvjhzaymlngg5armhp6xqrdjmnd29hpf7c3ci03h3rg4snbq"; - }; - - pname = "exneuland"; - version = "0.0.1"; - mixEnv = "prod"; - - mixDeps = packages.fetchMixDeps { - pname = "mix-deps-${pname}"; - inherit src mixEnv version; - sha256 = "0nyips2ky6rmgq3xdhrhg4fnw4m2pmck6p1amw9m7qisdqlxhv25"; - }; - -in (packages.mixRelease.override { - elixir = (import sources.nixpkgs-unstable {}).elixir_1_12; -}) { - inherit src pname version mixEnv mixDeps; - - buildInputs = [ rebar3 protobuf ]; -} |