Compare commits

...

5 commits

Author SHA1 Message Date
schweby
feb8e5b3c3
hainich: disable workadventure 2021-04-14 22:47:57 +02:00
schweby
02d3345e0c
hainich/minecraft: update to paper 1.16.5-592 2021-04-14 22:42:15 +02:00
schweby
761f8314b7
sources: update sources 2021-04-14 22:41:32 +02:00
schweby
e90f377a2b
hainich/hedgedoc: set domain to pad.hacc.earth 2021-04-12 19:38:05 +02:00
schweby
73bfa29896
hainich/hasenloch: change domain to himmel.infra4future.de 2021-04-09 22:49:37 +02:00
5 changed files with 20 additions and 20 deletions

View file

@ -18,7 +18,7 @@
./services/hasenloch.nix ./services/hasenloch.nix
./services/syncthing.nix ./services/syncthing.nix
./services/monitoring.nix ./services/monitoring.nix
./services/workadventure.nix # ./services/workadventure.nix
./services/minecraft.nix ./services/minecraft.nix
./services/mattermost.nix ./services/mattermost.nix
]; ];

View file

@ -22,10 +22,10 @@
allowAnonymous = true; allowAnonymous = true;
allowFreeURL = true; allowFreeURL = true;
allowGravatar = false; allowGravatar = false;
allowOrigin = [ "localhost" "pad.hacc.space" "fff-muc.de" ]; allowOrigin = [ "localhost" "pad.hacc.space" "fff-muc.de" "pad.hacc.earth" ];
dbURL = "postgres://codimd:codimd@localhost:5432/codimd"; dbURL = "postgres://codimd:codimd@localhost:5432/codimd";
defaultPermission = "limited"; defaultPermission = "limited";
domain = "pad.hacc.space"; domain = "pad.hacc.earth";
host = "0.0.0.0"; host = "0.0.0.0";
protocolUseSSL = true; protocolUseSSL = true;
hsts.preload = false; hsts.preload = false;
@ -63,7 +63,7 @@
}; };
}; };
services.nginx.virtualHosts."pad.hacc.space" = { services.nginx.virtualHosts."pad.hacc.earth" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/" = { locations."/" = {

View file

@ -17,10 +17,10 @@
sha256 = "1rfbbl69llb4nd6kpz1zqs9aqlfj3qkrp4qc58mzcs1ng3px30b9"; sha256 = "1rfbbl69llb4nd6kpz1zqs9aqlfj3qkrp4qc58mzcs1ng3px30b9";
}; };
}); });
domain = "himmel.hacc.earth"; domain = "himmel.infra4future.de";
config = { config = {
url = "https://himmel.hacc.earth"; url = "https://himmel.infra4future.de";
trusted_proxies = [ "${config.containers.hasenloch.hostAddress}/31" ]; trusted_proxies = [ "${config.containers.hasenloch.hostAddress}/31" ];
rewrite_urls = true; rewrite_urls = true;
@ -78,7 +78,7 @@
}; };
services.nginx.recommendedProxySettings = true; services.nginx.recommendedProxySettings = true;
services.nginx.virtualHosts."himmel.hacc.earth" = { services.nginx.virtualHosts."himmel.infra4future.de" = {
locations."/".proxyPass = "http://" + config.containers.hasenloch.localAddress; locations."/".proxyPass = "http://" + config.containers.hasenloch.localAddress;
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;

View file

@ -5,9 +5,9 @@
services.minecraft-server = { services.minecraft-server = {
enable = true; enable = true;
package = let package = let
version = "1.16.5-583"; version = "1.16.5-592";
url = "https://papermc.io/api/v2/projects/paper/versions/1.16.5/builds/583/downloads/paper-1.16.5-583.jar"; url = "https://papermc.io/api/v2/projects/paper/versions/1.16.5/builds/592/downloads/paper-1.16.5-592.jar";
sha256 = "0xpj1bk55cp34xamr7zlnm02xqdh02kybz1w5x1x35kangwfipq4"; sha256 = "039w44c7png9ppg8w2287mm0aavqdsvg9cdf50p2faa2bs586j9i";
in (pkgs.minecraft-server.overrideAttrs (old: rec { in (pkgs.minecraft-server.overrideAttrs (old: rec {
name = "minecraft-server-${version}"; name = "minecraft-server-${version}";
inherit version; inherit version;

View file

@ -5,10 +5,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f019c1cf16d0019d332ef43cffa0bd9bf007252b", "rev": "2aa20ae969f2597c4df10a094440a66e9d7f8c86",
"sha256": "05aqnb7lazn58kkkxavfqpb8h4as400bkf0v0qj4nr8gljz65r8s", "sha256": "0i5fxaxqm53zp767smrn250q1wjywf9c1jmg6vhp28973p7jysah",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/f019c1cf16d0019d332ef43cffa0bd9bf007252b.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/2aa20ae969f2597c4df10a094440a66e9d7f8c86.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {
@ -26,7 +26,7 @@
"nix-hexchen": { "nix-hexchen": {
"branch": "main", "branch": "main",
"repo": "https://gitlab.com/hexchen/nixfiles.git", "repo": "https://gitlab.com/hexchen/nixfiles.git",
"rev": "1ecc9bab2e1b7e9ba2f5eb595010079dbd1a7167", "rev": "0cdc8b141c112201e1fb7aff1d1bdce0406592c9",
"type": "git" "type": "git"
}, },
"nixos-mailserver": { "nixos-mailserver": {
@ -44,10 +44,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "91b77fe6942fe999b1efbe906dc98024d1917c0d", "rev": "dec334fa196a4aeedb1b60d8f7d61aa00d327499",
"sha256": "041l46ccllbf9b94jxahw64zsjxs1368y4m5a5q2h41w82jjmdk1", "sha256": "1sm1p2qliz11qw6va01knm0rikhpq2h4c70ci98vi4q26y4q9z72",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/91b77fe6942fe999b1efbe906dc98024d1917c0d.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/dec334fa196a4aeedb1b60d8f7d61aa00d327499.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
@ -56,10 +56,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde", "rev": "311ceed827f531f88f46222920cd1ebb2c101f73",
"sha256": "14r8qa6lnzp78c3amzi5r8n11l1kcxcx1gjhnc1kmn4indd43649", "sha256": "1790vn4wdldgjfjgcx10pnq9hvz7ymr52xmbrkimjld1knibp0gw",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/311ceed827f531f88f46222920cd1ebb2c101f73.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"pbb-nixfiles": { "pbb-nixfiles": {