diff options
Diffstat (limited to 'host')
5 files changed, 31 insertions, 12 deletions
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index ea023d6..ef4f7c0 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -7,6 +7,7 @@ ../../modules/users/levi.nix ../../modules/users/db2k.nix ../../modules/users/ks.nix + ../../modules/users/Alice.nix ./services/postgres.nix ./services/discordbots.nix diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix index 8e49043..e07dad3 100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix @@ -12,6 +12,8 @@ max_concurrent_requests = 1000; allow_check_for_updates = false; allow_registration = true; + yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true; + allow_guest_registration = true; disable_federation = true; }; }; diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix index f98a4e6..463c936 100755 --- a/host/Rory-nginx/services/matrix/conduit.nix +++ b/host/Rory-nginx/services/matrix/conduit.nix @@ -9,14 +9,15 @@ server_name = "conduit.rory.gay"; database_backend = "rocksdb"; - rocksdb_optimize_for_spinning_disks = true; - rocksdb_max_log_file_size = 33554432; +# rocksdb_optimize_for_spinning_disks = false; +# rocksdb_max_log_file_size = 33554432; - - allow_public_room_directory_over_federation = true; +# allow_public_room_directory_over_federation = true; - allow_device_name_federation = true; - enable_lightning_bolt = true; +# allow_device_name_federation = true; +# enable_lightning_bolt = true; + + #allow_local_presence = true; #allow_incoming_presence = true; #allow_outgoing_presence = true; @@ -24,14 +25,28 @@ #presence_offline_timeout_s = 180; - max_concurrent_requests = 1000; - conduit_cache_capacity_modifier = 3.0; +# max_concurrent_requests = 32767; +# conduit_cache_capacity_modifier = 4000.0; #512.0; +# db_cache_capacity_mb = 65535.0; #8192.0; +# rocksdb_parallelism_threads = 12; + + #dns settings +# dns_cache_entries = 65535; +# dns_min_ttl = 60 * 60 * 12; #12 hours... we expect other servers to backfill in the unlikely case an IP changes. +# dns_min_ttl_nxdomain = 60 * 60 * 24 * 7; #1 week... we expect backfill to happen must this change... +# dns_timeout = 15; +# dns_attempts = 15; #our DNS setup tends to fail +# query_all_nameservers = true; #needed on our setup... + +# federation_timeout = 30; +# federation_idle_per_host = 8; +# federation_idle_timeout = 600; allow_check_for_updates = false; allow_registration = false; - #log = "info,state_res=info"; +# log = "info,state_res=info"; #log = "debug"; }; }; diff --git a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix index 44b074a..81547aa 100755 --- a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix @@ -2,8 +2,8 @@ enableACME = true; addSSL = true; locations."/" = { - proxyPass = "http://127.0.0.1:9002"; - #proxyPass = "http://127.0.0.1:6167"; + #proxyPass = "http://127.0.0.1:9002"; + proxyPass = "http://127.0.0.1:6167"; extraConfig = '' if ($request_method = 'OPTIONS') { more_set_headers 'Access-Control-Allow-Origin: *'; diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix index 8aaedc8..6a5bf47 100755 --- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix @@ -2,7 +2,8 @@ enableACME = true; addSSL = true; locations."/" = { - proxyPass = "http://127.0.0.1:9001"; + #proxyPass = "http://127.0.0.1:9001"; + proxyPass = "http://localhost:8008"; extraConfig = '' if ($request_method = 'OPTIONS') { more_set_headers 'Access-Control-Allow-Origin: *'; |