diff options
| author | TheArcaneBrony <myrainbowdash949@gmail.com> | 2023-04-03 19:49:31 +0200 |
|---|---|---|
| committer | Rory& <root@rory.gay> | 2024-06-05 17:24:45 +0200 |
| commit | 52986029006a7ed4db7801bf394335318f07097f (patch) | |
| tree | 8a40001e1e1c20cccb897941eec86bfda7827162 | |
| parent | Port update script to service (diff) | |
| download | Spacebar-Open-Infrastructure-52986029006a7ed4db7801bf394335318f07097f.tar.xz | |
Add tab matrix proxy
| -rwxr-xr-x | host/Spacebar-nginx/configuration.nix | 2 | ||||
| -rwxr-xr-x | host/Spacebar-nginx/hosts/thearcanebrony.net/matrix.nix | 14 | ||||
| -rw-r--r-- | modules/auto-redeploy.nix | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/host/Spacebar-nginx/configuration.nix b/host/Spacebar-nginx/configuration.nix index b54a392..54884b9 100755 --- a/host/Spacebar-nginx/configuration.nix +++ b/host/Spacebar-nginx/configuration.nix @@ -25,6 +25,8 @@ recommendedProxySettings = true; recommendedTlsSettings = true; virtualHosts = { + "matrix.thearcanebrony.net" = import ./hosts/thearcanebrony.net/matrix.nix; + "mail.spacebar.chat" = import ./hosts/spacebar.chat/mail.nix; #local only diff --git a/host/Spacebar-nginx/hosts/thearcanebrony.net/matrix.nix b/host/Spacebar-nginx/hosts/thearcanebrony.net/matrix.nix new file mode 100755 index 0000000..d2b7606 --- /dev/null +++ b/host/Spacebar-nginx/hosts/thearcanebrony.net/matrix.nix @@ -0,0 +1,14 @@ +{ + enableACME = true; + addSSL = true; + locations = { + "/" = { + proxyPass = "http://192.168.1.200:8008"; + proxyWebsockets = true; + extraConfig = + "proxy_ssl_server_name on;" + + "proxy_pass_header Authorization;" + ; + }; + }; +} diff --git a/modules/auto-redeploy.nix b/modules/auto-redeploy.nix index ed951c7..680abb6 100644 --- a/modules/auto-redeploy.nix +++ b/modules/auto-redeploy.nix @@ -47,7 +47,7 @@ git rm --cached hardware-configuration.nix ) 2>&1 | tee /tmp/update.log #send the output to discord as a file - curl -S -F "file=@/tmp/update.log" -F "filename=update.log" -F "content=System finished redeploy." -H "Content-Type: multipart/form-data" ${secrets.webhooks.discord.deploy} + curl -S -F "file=@/tmp/update.log" -F "filename=update.log" -F "content=System finished redeploy. Make sure to check for errors, otherwise no future deployments will happen.\n***This requires manual intervention.***" -H "Content-Type: multipart/form-data" ${secrets.webhooks.discord.deploy} #store current commit in file echo $(git rev-parse HEAD) > currentCommit ''; |