diff --git a/hosts/fw/modules/firefox-sync.nix b/hosts/fw/modules/firefox-sync.nix index ed663d1..745f0d3 100644 --- a/hosts/fw/modules/firefox-sync.nix +++ b/hosts/fw/modules/firefox-sync.nix @@ -3,7 +3,9 @@ let domain = "sync.cloonar.com"; networkPrefix = config.networkPrefix; in { - sops.secrets.firefox-sync = { }; + sops.secrets.firefox-sync = { + mode = "0777"; + }; security.acme.certs."${domain}" = { group = "nginx"; @@ -36,32 +38,19 @@ in { services.mysql.package = pkgs.mariadb; services.firefox-syncserver = { enable = true; + settings.host = "0.0.0.0"; singleNode = { enable = true; - hostname = domain; + hostname = "0.0.0.0"; url = "https://${domain}"; }; - settings = { - tokenserver.enable = true; - }; secrets = "/run/secrets/firefox-sync"; - logLevel = "trace"; - }; - - services.nginx = { - enable = true; - virtualHosts."${domain}" = { - forceSSL = false; - enableACME = false; - locations."/" = { - proxyPass = "http://localhost:5000/"; - }; - }; + logLevel = "debug"; }; networking.firewall = { enable = true; - allowedTCPPorts = [ 80 443 ]; + allowedTCPPorts = [ 5000 ]; }; system.stateVersion = "23.05"; diff --git a/hosts/fw/modules/web/proxies.nix b/hosts/fw/modules/web/proxies.nix index e235b7c..44f1b99 100644 --- a/hosts/fw/modules/web/proxies.nix +++ b/hosts/fw/modules/web/proxies.nix @@ -21,8 +21,8 @@ enableACME = true; acmeRoot = null; locations."/" = { - proxyPass = "http://${config.networkPrefix}.97.6:80"; - proxyWebsockets = true; + proxyPass = "http://${config.networkPrefix}.97.6:5000"; + recommendedProxySettings = true; }; }; } diff --git a/hosts/nb/users/dominik.nix b/hosts/nb/users/dominik.nix index 104abff..bafb34d 100644 --- a/hosts/nb/users/dominik.nix +++ b/hosts/nb/users/dominik.nix @@ -72,7 +72,7 @@ let "devtools.toolbox.host" = "right"; "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"screenshot-button\",\"ublock0_raymondhill_net-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"_d634138d-c276-4fc8-924b-40a0ea21d284_-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"_testpilot-containers-browser-action\",\"unified-extensions-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"firefox-view-button\",\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"import-button\",\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"_d634138d-c276-4fc8-924b-40a0ea21d284_-browser-action\",\"_testpilot-containers-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"developer-button\"],\"dirtyAreaCache\":[\"unified-extensions-area\",\"nav-bar\",\"PersonalToolbar\"],\"currentVersion\":20,\"newElementCount\":3}"; "signon.rememberSignons" = false; - "identity.sync.tokenserver.uri" = "https://sync.cloonar.com/token/1.0/sync/1.5"; + "identity.sync.tokenserver.uri" = "https://sync.cloonar.com/1.0/sync/1.5"; # "toolkit.legacyUserProfileCustomizations.stylesheets" = true; "layout.css.devPixelsPerPx" = "1.5"; "media.ffmpeg.vaapi.enabled" = true;