turn off acme, since i was testing on capsul

This commit is contained in:
Anish L 2022-08-02 21:25:31 +10:00
parent 62e24241c9
commit 31bec5a490
2 changed files with 21 additions and 17 deletions

View file

@ -9,7 +9,7 @@
httpPort = 3001; httpPort = 3001;
database = { database = {
type = "postgres"; type = "postgres";
# passwordFile = "/run/secrets/gitea-dbpass"; # supplied by agenix # passwordFile = "/run/secrets/gitea-dbpass"; # TODO supplied by agenix
password = "somethingunknowablesorry"; password = "somethingunknowablesorry";
}; };
settings = { settings = {
@ -32,10 +32,12 @@
'' ''
gitea-users gitea gitea gitea-users gitea gitea
''; '';
ensureDatabases = [ "gitea" ]; # ensureDatabases = [ "gitea" ];
ensureUsers = [ ensureUsers = [
{ name = "gitea"; ensurePermissions."DATABASE gitea" = "ALLPRIVLEGES"; } { name = "gitea"; ensurePermissions."DATABASE gitea" = "ALL PRIVLEGES"; }
]; ];
# TODO
# initialScript # set password for gitea user
}; };
services.nginx = { services.nginx = {
@ -46,8 +48,8 @@
recommendedTlsSettings = true; recommendedTlsSettings = true;
virtualHosts."git.sealight.xyz" = { virtualHosts."git.sealight.xyz" = {
# Gitea hostname # Gitea hostname
enableACME = true; # Use ACME certs # enableACME = true; # Use ACME certs
forceSSL = true; # Force SSL # forceSSL = true; # Force SSL
locations."/".proxyPass = "http://localhost:3001/"; # Proxy Gitea locations."/".proxyPass = "http://localhost:3001/"; # Proxy Gitea
}; };
}; };

View file

@ -97,11 +97,12 @@
group = "turnserver"; group = "turnserver";
}; };
services.jitsi-meet = { # TODO fix up jitsi bridge stuff
enable = true; ## services.jitsi-meet = {
hostName = "jitsi.sealight.xyz"; ## enable = true;
}; ## hostName = "jitsi.sealight.xyz";
services.jitsi-videobridge.enable = true; ## };
## services.jitsi-videobridge.enable = true;
services.mautrix-telegram = { services.mautrix-telegram = {
enable = true; enable = true;
@ -177,8 +178,9 @@
## postgresql user and db name remains in the ## postgresql user and db name remains in the
## service.matrix-synapse.database_args setting which ## service.matrix-synapse.database_args setting which
## by default is matrix-synapse ## by default is matrix-synapse
# TODO agenix
initialScript = pkgs.writeText "synapse-init.sql" '' initialScript = pkgs.writeText "synapse-init.sql" ''
CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD "Da0?H*9i{x?,]|'kq@iBwlIzu"; CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD "Da0?H*9i{x?,]|'kq@iBwlIzu";
CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
TEMPLATE template0 TEMPLATE template0
LC_COLLATE = "C" LC_COLLATE = "C"
@ -254,8 +256,8 @@
## virtual host for Synapse ## virtual host for Synapse
"chat.sealight.xyz" = { "chat.sealight.xyz" = {
#forceSSL = true; #forceSSL = true;
#enableACME = true; #enableACME = true; # TODO
#useACMEHost = "sealight.xyz"; #useACMEHost = "sealight.xyz"; # TODO
locations."/" = { locations."/" = {
proxyPass = "http://localhost:8448"; proxyPass = "http://localhost:8448";
}; };
@ -263,16 +265,16 @@
## virtual host for Riot/Web ## virtual host for Riot/Web
"element.sealight.xyz" = { "element.sealight.xyz" = {
#forceSSL = true; #forceSSL = true;
#enableACME = true; #enableACME = true; # TODO
#useACMEHost = "sealight.xyz"; #useACMEHost = "sealight.xyz"; # TODO
## root points to the riot-web package content, also configured via Nix ## root points to the riot-web package content, also configured via Nix
locations."/" = { locations."/" = {
root = pkgs.element-web; root = pkgs.element-web;
}; };
}; };
${config.services.jitsi-meet.hostName} = { ${config.services.jitsi-meet.hostName} = {
#enableACME = true; #enableACME = true; # TODO
#forceSSL = true; #forceSSL = true; # TODO
}; };
}; };
## other nginx specific best practices ## other nginx specific best practices