From d9c5393cffadbb7c86915b465c4c4dc7c1412913 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Thu, 6 Jun 2024 00:23:09 +0100 Subject: [PATCH 1/2] [yevaud] Change Forgejo domain name --- hosts/yevaud/forgejo.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hosts/yevaud/forgejo.nix b/hosts/yevaud/forgejo.nix index 31e8494..e103297 100644 --- a/hosts/yevaud/forgejo.nix +++ b/hosts/yevaud/forgejo.nix @@ -10,19 +10,23 @@ # TODO: interface customisation services.nginx.virtualHosts = { - # TODO: move to new domain - "git.katherina.rocks" = { + "git.qenya.tel" = { forceSSL = true; enableACME = true; locations."/".proxyPass = "http://[::1]:3000/"; }; + "git.katherina.rocks" = { + forceSSL = true; + enableACME = true; + locations."/".return = "301 https://git.qenya.tel$request_uri"; + }; }; services.forgejo = { enable = true; stateDir = "/data/forgejo"; settings = { - DEFAULT.APP_NAME = "git.katherina.rocks"; + DEFAULT.APP_NAME = "git.qenya.tel"; cache = { ADAPTER = "twoqueue"; HOST = ''{"size": 100, "recent_ratio": 0.25, "ghost_ratio": 0.5}''; @@ -33,9 +37,9 @@ }; security.LOGIN_REMEMBER_DAYS = 365; server = { - DOMAIN = "git.katherina.rocks"; + DOMAIN = "git.qenya.tel"; HTTP_PORT = 3000; - ROOT_URL = "https://git.katherina.rocks/"; + ROOT_URL = "https://git.qenya.tel/"; }; service.DISABLE_REGISTRATION = true; }; From 8f3b17df2b87137e0f62cd87a1b02d5836d301c5 Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Thu, 6 Jun 2024 00:23:19 +0100 Subject: [PATCH 2/2] Fill out readme --- README.md | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e860f06..a28cfc1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,32 @@ -# nixos-config +# nixfiles -My NixOS configuration files \ No newline at end of file +My NixOS configuration files. + +## Machines + +* `tohru`: Dell Latitude 5300, personal laptop +* `yevaud`: Oracle Cloud free AMD VM, hosts a Forgejo instance + +## Usage + +### Building + +To build locally, run `colmena apply-local` as root. + +To build the remote machines, run `colmena apply`. See the [colmena documentation](https://colmena.cli.rs/) for command-line options. Notable options include: +* `--on [hostname]`: build a specific machine only +* `--reboot`: reboot after building (but note [this bug](https://github.com/zhaofengli/colmena/issues/166) means it may hang even when the reboot completes successfully) + +### Updating + +Run `npins update` to update the dependencies within the currently selected upgrade channels. + +To upgrade to a new major version of a dependency, simply re-add it and the old version will be overwritten, e.g.: + +```sh +npins add --name nixpkgs channel nixos-unstable +``` + +In either case, commit the changes to `npins/sources.json`. + +See the [npins documentation](https://github.com/andir/npins) for more details. \ No newline at end of file