diff --git a/flake.lock b/flake.lock index af72db5..53a25b9 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1757997814, - "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", + "lastModified": 1758119172, + "narHash": "sha256-LnVuGLf0PJHqqIHroxEzwXS57mjAdHSrXi0iODKbbiU=", "owner": "nix-community", "repo": "home-manager", - "rev": "5820376beb804de9acf07debaaff1ac84728b708", + "rev": "9f408dc51c8e8216a94379e6356bdadbe8b4fef9", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1758070117, + "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1757924820, - "narHash": "sha256-to/hwbY9/jsRaejPa5oJmPUFZsJfFCB3WReKhD0+/+E=", + "lastModified": 1758098782, + "narHash": "sha256-sX+iNoZkgSQsnsCHO6aI7mYh2GqbYDLWMB0iN41i61k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa54acd34af0e86f49d55ea52823031e2da399df", + "rev": "5874893c92e656c85dc729e8b570fc38d3c85853", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758008446, - "narHash": "sha256-n1carH6n9xIARoDzmzZPyxlU2MVEuGAFt2UAvVOACJg=", + "lastModified": 1758144108, + "narHash": "sha256-fq/Fd89pUrdVcFmw8aNVQoF9UPq7L5gtS/0ioPTUNKg=", "owner": "nix-community", "repo": "NUR", - "rev": "1b8ae8bec68487a61944cfdbfcb67f4aa69ff002", + "rev": "47a4f8514d9aecd033d53a84f698a115b3074f2b", "type": "github" }, "original": { diff --git a/hosts/terre-neuvas/configuration.nix b/hosts/terre-neuvas/configuration.nix index dcfb383..6910c19 100644 --- a/hosts/terre-neuvas/configuration.nix +++ b/hosts/terre-neuvas/configuration.nix @@ -11,7 +11,6 @@ [ # Include the results of the hardware scan. ./hardware.nix ../../profiles/server-selfhosted.nix - ../../modules/services/caddy.nix ../../modules/services/forgejo.nix ]; diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix deleted file mode 100644 index bb7ea1f..0000000 --- a/modules/services/caddy.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ pkgs, ...}: { - services.caddy = { - enable = true; - virtualHosts."blog.lomig.me" = { - extraConfig = '' - root * /var/www/lomig - file_server - ''; - }; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; - systemd.tmpfiles.rules = [ - "d /var/www/lomig 0755 lomig users -" - ]; - systemd.services.hugo-blog-build = { - description = "Build Hugo Blog"; - after = [ "network.target" ]; - serviceConfig = { - Type = "oneshot"; - ExecStart = /home/lomig/scripts/blog-sync-and-build.sh; - User = "lomig"; - }; - }; - - systemd.timers.hugo-blog-build = { - description = "Daily Hugo Blog Build"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "daily 06:00"; - Persistent = true; - }; - }; -} diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index fc224ee..4042456 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -21,9 +21,9 @@ }; settings = { server = { - DOMAIN = "git.lomig.me"; - ROOT_URL = "https://git.lomig.me/"; - SSH_DOMAIN = "git.lomig.me"; + DOMAIN = "govel.porzh.me"; + ROOT_URL = "https://govel.porzh.me/"; + SSH_DOMAIN = "govel.porzh.me"; HTTP_PORT = 3000; SSH_PORT = 22; START_SSH_SERVER = false; @@ -45,10 +45,10 @@ services.openssh.enable = true; networking.firewall.interfaces."eth0".allowedTCPPorts = [ 22 ]; # pour admin - # --- Caddy pour git.lomig.me --- + # --- Caddy pour govel.porzh.me --- services.caddy = { enable = true; - virtualHosts."git.lomig.me" = { + virtualHosts."govel.porzh.me" = { extraConfig = '' reverse_proxy localhost:3000 ''; diff --git a/modules/sites/porzh.me.nix b/modules/sites/porzh.me.nix new file mode 100644 index 0000000..4a39496 --- /dev/null +++ b/modules/sites/porzh.me.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: + +let + porzhSite = pkgs.stdenv.mkDerivation { + pname = "porzh-site"; + version = "1.0"; + src = ./porzh.me; # le dossier avec ton index.html, image, etc. + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + }; +in { + services.caddy = { + enable = true; + virtualHosts = { + "porzh.me" = { + serverAliases = [ "www.porzh.me" ]; + extraConfig = '' + root * ${porzhSite} + file_server + ''; + }; + }; + }; +} + diff --git a/modules/sites/porzh.me/ancre.png b/modules/sites/porzh.me/ancre.png new file mode 100644 index 0000000..18e9e4c Binary files /dev/null and b/modules/sites/porzh.me/ancre.png differ diff --git a/modules/sites/porzh.me/index.html b/modules/sites/porzh.me/index.html new file mode 100644 index 0000000..4fe0030 --- /dev/null +++ b/modules/sites/porzh.me/index.html @@ -0,0 +1,51 @@ + + + + + Page centrée + + + + + + + Ancre +

porzh.me

+

Ma porzh stag

+ + + + diff --git a/profiles/server-selfhosted.nix b/profiles/server-selfhosted.nix index 03c37e5..a6f6e5f 100644 --- a/profiles/server-selfhosted.nix +++ b/profiles/server-selfhosted.nix @@ -4,6 +4,7 @@ ../modules/common/base.nix ../modules/common/networking.nix ../modules/services/printing.nix + ../modules/sites/porzh.me.nix ]; services.openssh.enable = true;