diff options
| author | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2024-10-18 22:41:40 +0200 |
|---|---|---|
| committer | Patryk Niedźwiedziński <pniedzwiedzinski19@gmail.com> | 2024-10-18 22:41:40 +0200 |
| commit | 923c6b95e408fec374a15a0c3b0db2a2b28003b9 (patch) | |
| tree | fb2e31833b42bf47d87a0598364a90c513ed9395 | |
| parent | b68586cd0b39e590efba6a5e71651fb5e1e02f5c (diff) | |
| parent | 2eb1a14886e5290357285cab62e5ff5662b2fd56 (diff) | |
| download | dots-923c6b95e408fec374a15a0c3b0db2a2b28003b9.tar.gz dots-923c6b95e408fec374a15a0c3b0db2a2b28003b9.zip | |
Merge branch 'master' of github.com:pniedzwiedzinski/dots
| -rw-r--r-- | machines/srv3/configuration.nix | 8 | ||||
| -rw-r--r-- | modules/obsidian-livesync.nix | 24 |
2 files changed, 14 insertions, 18 deletions
diff --git a/machines/srv3/configuration.nix b/machines/srv3/configuration.nix index 197aec6..d1fb4e2 100644 --- a/machines/srv3/configuration.nix +++ b/machines/srv3/configuration.nix @@ -4,6 +4,8 @@ let www = "/srv/www"; + domain = "niedzwiedzinski.cyou"; + in { imports = @@ -16,8 +18,8 @@ in services.obsidian-livesync = { enable = true; - domain = "obsidian.niedzwiedzinski.cyou"; - couchdb.adminPass = "123"; + domain = "obsidian.${domain}"; + adminsFile = "/etc/couchdb.ini"; }; boot.loader.grub.enable = true; @@ -36,7 +38,7 @@ in }; hostName = "srv3"; extraHosts = '' - 192.168.1.136 srv3.niedzwiedzinski.cyou git.niedzwiedzinski.cyou tmp.niedzwiedzinski.cyou zhr.niedzwiedzinski.cyou help.niedzwiedzinski.cyou niedzwiedzinski.cyou pics.niedzwiedzinski.cyou fresh.niedzwiedzinski.cyou + 192.168.1.136 srv3.niedzwiedzinski.cyou git.niedzwiedzinski.cyou tmp.niedzwiedzinski.cyou zhr.niedzwiedzinski.cyou help.niedzwiedzinski.cyou niedzwiedzinski.cyou pics.niedzwiedzinski.cyou fresh.niedzwiedzinski.cyou obsidian.${domain} 192.168.1.144 srv2.niedzwiedzinski.cyou '' + lib.readFile ( pkgs.fetchurl { url = "https://raw.githubusercontent.com/StevenBlack/hosts/d2be343994aacdec74865ff8d159cf6e46359adf/alternates/fakenews-gambling-porn/hosts"; diff --git a/modules/obsidian-livesync.nix b/modules/obsidian-livesync.nix index 3925bd2..e576eb0 100644 --- a/modules/obsidian-livesync.nix +++ b/modules/obsidian-livesync.nix @@ -58,14 +58,12 @@ in [httpd] WWW-Authenticate = Basic realm="couchdb" + enable_cors = true bind_address = 127.0.0.1 - + [cors] - origins = app://obsidian.md, capacitor://localhost, http://localhost - credentials = true - headers = accept, authorization, content-type, origin, referer - methods = GET,PUT,POST,HEAD,DELETE - max_age = 3600 + #origins = app://obsidian.md,capacitor://localhost,http://localhost + #credentials = true ''; }; @@ -81,17 +79,13 @@ in proxy_set_header X-Real-IP "$remote_addr"; proxy_set_header X-Forwarded-For "$proxy_add_x_forwarded_for"; proxy_set_header X-Forwarded-Proto "$scheme"; - # add_header Access-Control-Allow-Origin "app://obsidian.md"; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Content-Type, Authorization"; - add_header Access-Control-Allow-Credentials "true"; - add_header Access-Control-Max-Age 86400; + add_header Access-Control-Allow-Origin "$http_origin" always; + add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS" always; + add_header Access-Control-Allow-Headers "Content-Type, Authorization" always; + add_header Access-Control-Allow-Credentials "true" always; + add_header Access-Control-Max-Age 86400 always; if ($request_method = OPTIONS) { - # add_header Access-Control-Allow-Origin "app://obsidian.md"; - add_header Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"; - add_header Access-Control-Allow-Headers "Content-Type, Authorization"; - add_header Access-Control-Allow-Credentials "true"; return 204; } ''; |