From 64b853f016686efc2a14b20bef318ea322e8d370 Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Thu, 17 Oct 2024 10:24:57 +0200 Subject: t14: 83 current 2024-10-17 10:24:44 24.05.20241004.6e6b3dd 6.6.54 * --- machines/srv3/configuration.nix | 7 +++++++ machines/t14/default.nix | 7 +++++++ modules/obsidian-livesync.nix | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/machines/srv3/configuration.nix b/machines/srv3/configuration.nix index 8438826..197aec6 100644 --- a/machines/srv3/configuration.nix +++ b/machines/srv3/configuration.nix @@ -8,11 +8,18 @@ in { imports = [ + ../../modules/obsidian-livesync.nix ./hardware-configuration.nix ./cgit.nix ./noip.nix ]; + services.obsidian-livesync = { + enable = true; + domain = "obsidian.niedzwiedzinski.cyou"; + couchdb.adminPass = "123"; + }; + boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only diff --git a/machines/t14/default.nix b/machines/t14/default.nix index acb9b2c..69b8c64 100644 --- a/machines/t14/default.nix +++ b/machines/t14/default.nix @@ -4,6 +4,7 @@ [ # Include the results of the hardware scan. ../base.nix ../../modules/media-drive.nix + ../../modules/obsidian-livesync.nix ../x220-gnome/pass.nix ./hardware-configuration.nix ../x220-gnome/pn.nix @@ -13,6 +14,12 @@ networking.networkmanager.enable = true; networking.hostName = "t14"; + services.obsidian-livesync = { + enable = true; + domain = "test.localhost"; + couchdb.adminPass = "123"; + }; + # Set your time zone. time.timeZone = "Europe/Warsaw"; diff --git a/modules/obsidian-livesync.nix b/modules/obsidian-livesync.nix index d565a3e..7bbde9d 100644 --- a/modules/obsidian-livesync.nix +++ b/modules/obsidian-livesync.nix @@ -37,8 +37,8 @@ in services.nginx = { enable = true; virtualHosts.${cfg.domain} = { - enableACME = true; - forceSSL = true; +# enableACME = true; +# forceSSL = true; locations."/" = { proxyPass = "http://127.0.0.1:${toString couchdb-port}"; extraConfig = '' -- cgit 1.4.1