diff --git a/README.md b/README.md index 24ecfaf..9a9659c 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ * [ ] self-hosted binary cache (single-machine) (nix-serve, carinae, harmonia, eris or attic, ssh?) * https://discourse.nixos.org/t/announcing-harmonia-a-nix-binary-cache-written-in-rust/19855 * https://discourse.nixos.org/t/introducing-attic-a-self-hostable-nix-binary-cache-server/24343/1 -* [ ] profiles/web: make ACME/nginx helper a function +* [ ] profiles/http: make ACME/nginx helper a function * [ ] Support multiple tlds * [ ] Support multiple acme accounts * [ ] Support a per-account provider? diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index d6e367d..33f8693 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -25,60 +25,60 @@ ../../profiles/services/tmate-server.nix # opens port 42244 - ../../profiles/web # enables nginx+acme, defines mkDomain - ../../profiles/web/index - ../../profiles/web/services/cinny.nix - ../../profiles/web/services/element.nix - ../../profiles/web/services/flexget.nix - ../../profiles/web/services/gitea.nix - #../../profiles/web/services/hydra.nix - ../../profiles/web/services/invidious.nix - ../../profiles/web/services/rss-bridge.nix - ../../profiles/web/services/jellyfin.nix - ../../profiles/web/services/libreddit.nix - #../../profiles/web/services/mattermost.nix - #../../profiles/web/services/navidrome.nix - ../../profiles/web/services/netdata.nix - ../../profiles/web/services/nitter.nix - #../../profiles/web/services/ntopng.nix - ../../profiles/web/services/microbin.nix - #../../profiles/web/services/owncast.nix - #../../profiles/web/services/paperless.nix - ../../profiles/web/services/polaris.nix - #../../profiles/web/services/resilio.nix - ../../profiles/web/services/roundcube.nix - ../../profiles/web/services/thelounge.nix - ../../profiles/web/services/vaultwarden.nix - ../../profiles/web/services/webdav-zotero.nix - #../../profiles/web/services/convos.nix - #../../profiles/web/services/cryptpad.nix - #../../profiles/web/services/galene.nix - #../../profiles/web/services/graphana.nix - ../../profiles/web/services/hedgedoc.nix - #../../profiles/web/services/home-assistant.nix - #../../profiles/web/services/jitsi-meet.nix - #../../profiles/web/services/kukkee - #../../profiles/web/services/matrix-synapse.nix - #../../profiles/web/services/shlink.nix - #../../profiles/web/services/sourcegraph.nix - #../../profiles/web/services/censordodge.nix - #../../profiles/web/services/openspeedtest.nix + ../../profiles/http # enables nginx+acme, defines mkDomain + ../../profiles/http/index + ../../profiles/http/services/cinny.nix + ../../profiles/http/services/element.nix + ../../profiles/http/services/flexget.nix + ../../profiles/http/services/gitea.nix + #../../profiles/http/services/hydra.nix + ../../profiles/http/services/invidious.nix + ../../profiles/http/services/rss-bridge.nix + ../../profiles/http/services/jellyfin.nix + ../../profiles/http/services/libreddit.nix + #../../profiles/http/services/mattermost.nix + #../../profiles/http/services/navidrome.nix + ../../profiles/http/services/netdata.nix + ../../profiles/http/services/nitter.nix + #../../profiles/http/services/ntopng.nix + ../../profiles/http/services/microbin.nix + #../../profiles/http/services/owncast.nix + #../../profiles/http/services/paperless.nix + ../../profiles/http/services/polaris.nix + #../../profiles/http/services/resilio.nix + ../../profiles/http/services/roundcube.nix + ../../profiles/http/services/thelounge.nix + ../../profiles/http/services/vaultwarden.nix + ../../profiles/http/services/webdav-zotero.nix + #../../profiles/http/services/convos.nix + #../../profiles/http/services/cryptpad.nix + #../../profiles/http/services/galene.nix + #../../profiles/http/services/graphana.nix + ../../profiles/http/services/hedgedoc.nix + #../../profiles/http/services/home-assistant.nix + #../../profiles/http/services/jitsi-meet.nix + #../../profiles/http/services/kukkee + #../../profiles/http/services/matrix-synapse.nix + #../../profiles/http/services/shlink.nix + #../../profiles/http/services/sourcegraph.nix + #../../profiles/http/services/censordodge.nix + #../../profiles/http/services/openspeedtest.nix - ../../profiles/web/docs - ../../profiles/web/docs/pdoc.nix - ../../profiles/web/docs/python-docs.nix - ../../profiles/web/docs/nixpkgs.nix - ../../profiles/web/docs/home-manager.nix - ../../profiles/web/docs/linux-docs.nix - ../../profiles/web/docs/programs.nix - ../../profiles/web/docs/yagcd.nix + ../../profiles/http/docs + ../../profiles/http/docs/pdoc.nix + ../../profiles/http/docs/python-docs.nix + ../../profiles/http/docs/nixpkgs.nix + ../../profiles/http/docs/home-manager.nix + ../../profiles/http/docs/linux-docs.nix + ../../profiles/http/docs/programs.nix + ../../profiles/http/docs/yagcd.nix - #../../profiles/web/sites/linktree-pbsds.nix - ../../profiles/web/sites/refleksjon-no.nix - ../../profiles/web/sites/roroslyd-no.nix - ../../profiles/web/sites/kuklefse.nix + #../../profiles/http/sites/linktree-pbsds.nix + ../../profiles/http/sites/refleksjon-no.nix + ../../profiles/http/sites/roroslyd-no.nix + ../../profiles/http/sites/kuklefse.nix - #../../profiles/web/services/trivial-gradios + #../../profiles/http/services/trivial-gradios #../../profiles/code-remote # TODO: move into web? services? ../../profiles/domeneshop-dyndns diff --git a/profiles/web/default.nix b/profiles/http/default.nix similarity index 100% rename from profiles/web/default.nix rename to profiles/http/default.nix diff --git a/profiles/web/docs/default.nix b/profiles/http/docs/default.nix similarity index 100% rename from profiles/web/docs/default.nix rename to profiles/http/docs/default.nix diff --git a/profiles/web/docs/home-manager.nix b/profiles/http/docs/home-manager.nix similarity index 100% rename from profiles/web/docs/home-manager.nix rename to profiles/http/docs/home-manager.nix diff --git a/profiles/web/docs/linux-docs.nix b/profiles/http/docs/linux-docs.nix similarity index 100% rename from profiles/web/docs/linux-docs.nix rename to profiles/http/docs/linux-docs.nix diff --git a/profiles/web/docs/nixpkgs.nix b/profiles/http/docs/nixpkgs.nix similarity index 100% rename from profiles/web/docs/nixpkgs.nix rename to profiles/http/docs/nixpkgs.nix diff --git a/profiles/web/docs/pdoc.nix b/profiles/http/docs/pdoc.nix similarity index 100% rename from profiles/web/docs/pdoc.nix rename to profiles/http/docs/pdoc.nix diff --git a/profiles/web/docs/programs.nix b/profiles/http/docs/programs.nix similarity index 100% rename from profiles/web/docs/programs.nix rename to profiles/http/docs/programs.nix diff --git a/profiles/web/docs/python-docs.nix b/profiles/http/docs/python-docs.nix similarity index 100% rename from profiles/web/docs/python-docs.nix rename to profiles/http/docs/python-docs.nix diff --git a/profiles/web/docs/yagcd.nix b/profiles/http/docs/yagcd.nix similarity index 100% rename from profiles/web/docs/yagcd.nix rename to profiles/http/docs/yagcd.nix diff --git a/profiles/web/index/default.nix b/profiles/http/index/default.nix similarity index 100% rename from profiles/web/index/default.nix rename to profiles/http/index/default.nix diff --git a/profiles/web/services/censordodge.nix b/profiles/http/services/censordodge.nix similarity index 100% rename from profiles/web/services/censordodge.nix rename to profiles/http/services/censordodge.nix diff --git a/profiles/web/services/cinny.nix b/profiles/http/services/cinny.nix similarity index 100% rename from profiles/web/services/cinny.nix rename to profiles/http/services/cinny.nix diff --git a/profiles/web/services/convos.nix b/profiles/http/services/convos.nix similarity index 100% rename from profiles/web/services/convos.nix rename to profiles/http/services/convos.nix diff --git a/profiles/web/services/cryptpad.nix b/profiles/http/services/cryptpad.nix similarity index 100% rename from profiles/web/services/cryptpad.nix rename to profiles/http/services/cryptpad.nix diff --git a/profiles/web/services/element.nix b/profiles/http/services/element.nix similarity index 100% rename from profiles/web/services/element.nix rename to profiles/http/services/element.nix diff --git a/profiles/web/services/flexget.nix b/profiles/http/services/flexget.nix similarity index 100% rename from profiles/web/services/flexget.nix rename to profiles/http/services/flexget.nix diff --git a/profiles/web/services/galene.nix b/profiles/http/services/galene.nix similarity index 100% rename from profiles/web/services/galene.nix rename to profiles/http/services/galene.nix diff --git a/profiles/web/services/gitea.nix b/profiles/http/services/gitea.nix similarity index 100% rename from profiles/web/services/gitea.nix rename to profiles/http/services/gitea.nix diff --git a/profiles/web/services/graphana.nix b/profiles/http/services/graphana.nix similarity index 100% rename from profiles/web/services/graphana.nix rename to profiles/http/services/graphana.nix diff --git a/profiles/web/services/hedgedoc.nix b/profiles/http/services/hedgedoc.nix similarity index 100% rename from profiles/web/services/hedgedoc.nix rename to profiles/http/services/hedgedoc.nix diff --git a/profiles/web/services/home-assistant.nix b/profiles/http/services/home-assistant.nix similarity index 100% rename from profiles/web/services/home-assistant.nix rename to profiles/http/services/home-assistant.nix diff --git a/profiles/web/services/hydra.nix b/profiles/http/services/hydra.nix similarity index 100% rename from profiles/web/services/hydra.nix rename to profiles/http/services/hydra.nix diff --git a/profiles/web/services/invidious.nix b/profiles/http/services/invidious.nix similarity index 100% rename from profiles/web/services/invidious.nix rename to profiles/http/services/invidious.nix diff --git a/profiles/web/services/jellyfin.nix b/profiles/http/services/jellyfin.nix similarity index 100% rename from profiles/web/services/jellyfin.nix rename to profiles/http/services/jellyfin.nix diff --git a/profiles/web/services/jitsi-meet.nix b/profiles/http/services/jitsi-meet.nix similarity index 100% rename from profiles/web/services/jitsi-meet.nix rename to profiles/http/services/jitsi-meet.nix diff --git a/profiles/web/services/kukkee/default.nix b/profiles/http/services/kukkee/default.nix similarity index 100% rename from profiles/web/services/kukkee/default.nix rename to profiles/http/services/kukkee/default.nix diff --git a/profiles/web/services/kukkee/module/default.nix b/profiles/http/services/kukkee/module/default.nix similarity index 100% rename from profiles/web/services/kukkee/module/default.nix rename to profiles/http/services/kukkee/module/default.nix diff --git a/profiles/web/services/kukkee/pkg/default.nix b/profiles/http/services/kukkee/pkg/default.nix similarity index 100% rename from profiles/web/services/kukkee/pkg/default.nix rename to profiles/http/services/kukkee/pkg/default.nix diff --git a/profiles/web/services/kukkee/pkg/node-composition.nix b/profiles/http/services/kukkee/pkg/node-composition.nix similarity index 100% rename from profiles/web/services/kukkee/pkg/node-composition.nix rename to profiles/http/services/kukkee/pkg/node-composition.nix diff --git a/profiles/web/services/kukkee/pkg/node-env.nix b/profiles/http/services/kukkee/pkg/node-env.nix similarity index 100% rename from profiles/web/services/kukkee/pkg/node-env.nix rename to profiles/http/services/kukkee/pkg/node-env.nix diff --git a/profiles/web/services/kukkee/pkg/node-packages.nix b/profiles/http/services/kukkee/pkg/node-packages.nix similarity index 100% rename from profiles/web/services/kukkee/pkg/node-packages.nix rename to profiles/http/services/kukkee/pkg/node-packages.nix diff --git a/profiles/web/services/kukkee/pkg/update-node-deps.sh b/profiles/http/services/kukkee/pkg/update-node-deps.sh similarity index 100% rename from profiles/web/services/kukkee/pkg/update-node-deps.sh rename to profiles/http/services/kukkee/pkg/update-node-deps.sh diff --git a/profiles/web/services/kukkee/pkg/update-version.sh b/profiles/http/services/kukkee/pkg/update-version.sh similarity index 100% rename from profiles/web/services/kukkee/pkg/update-version.sh rename to profiles/http/services/kukkee/pkg/update-version.sh diff --git a/profiles/web/services/kukkee/pkg/update.sh b/profiles/http/services/kukkee/pkg/update.sh similarity index 100% rename from profiles/web/services/kukkee/pkg/update.sh rename to profiles/http/services/kukkee/pkg/update.sh diff --git a/profiles/web/services/libreddit.nix b/profiles/http/services/libreddit.nix similarity index 100% rename from profiles/web/services/libreddit.nix rename to profiles/http/services/libreddit.nix diff --git a/profiles/web/services/matrix-synapse.nix b/profiles/http/services/matrix-synapse.nix similarity index 100% rename from profiles/web/services/matrix-synapse.nix rename to profiles/http/services/matrix-synapse.nix diff --git a/profiles/web/services/mattermost.nix b/profiles/http/services/mattermost.nix similarity index 100% rename from profiles/web/services/mattermost.nix rename to profiles/http/services/mattermost.nix diff --git a/profiles/web/services/microbin.nix b/profiles/http/services/microbin.nix similarity index 100% rename from profiles/web/services/microbin.nix rename to profiles/http/services/microbin.nix diff --git a/profiles/web/services/navidrome.nix b/profiles/http/services/navidrome.nix similarity index 100% rename from profiles/web/services/navidrome.nix rename to profiles/http/services/navidrome.nix diff --git a/profiles/web/services/netdata.nix b/profiles/http/services/netdata.nix similarity index 100% rename from profiles/web/services/netdata.nix rename to profiles/http/services/netdata.nix diff --git a/profiles/web/services/nitter.nix b/profiles/http/services/nitter.nix similarity index 100% rename from profiles/web/services/nitter.nix rename to profiles/http/services/nitter.nix diff --git a/profiles/web/services/ntopng.nix b/profiles/http/services/ntopng.nix similarity index 100% rename from profiles/web/services/ntopng.nix rename to profiles/http/services/ntopng.nix diff --git a/profiles/web/services/openspeedtest.nix b/profiles/http/services/openspeedtest.nix similarity index 100% rename from profiles/web/services/openspeedtest.nix rename to profiles/http/services/openspeedtest.nix diff --git a/profiles/web/services/owncast.nix b/profiles/http/services/owncast.nix similarity index 100% rename from profiles/web/services/owncast.nix rename to profiles/http/services/owncast.nix diff --git a/profiles/web/services/paperless.nix b/profiles/http/services/paperless.nix similarity index 100% rename from profiles/web/services/paperless.nix rename to profiles/http/services/paperless.nix diff --git a/profiles/web/services/polaris.nix b/profiles/http/services/polaris.nix similarity index 100% rename from profiles/web/services/polaris.nix rename to profiles/http/services/polaris.nix diff --git a/profiles/web/services/resilio.nix b/profiles/http/services/resilio.nix similarity index 100% rename from profiles/web/services/resilio.nix rename to profiles/http/services/resilio.nix diff --git a/profiles/web/services/roundcube.nix b/profiles/http/services/roundcube.nix similarity index 100% rename from profiles/web/services/roundcube.nix rename to profiles/http/services/roundcube.nix diff --git a/profiles/web/services/rss-bridge.nix b/profiles/http/services/rss-bridge.nix similarity index 100% rename from profiles/web/services/rss-bridge.nix rename to profiles/http/services/rss-bridge.nix diff --git a/profiles/web/services/shlink.nix b/profiles/http/services/shlink.nix similarity index 100% rename from profiles/web/services/shlink.nix rename to profiles/http/services/shlink.nix diff --git a/profiles/web/services/sourcegraph.nix b/profiles/http/services/sourcegraph.nix similarity index 100% rename from profiles/web/services/sourcegraph.nix rename to profiles/http/services/sourcegraph.nix diff --git a/profiles/web/services/thelounge.nix b/profiles/http/services/thelounge.nix similarity index 100% rename from profiles/web/services/thelounge.nix rename to profiles/http/services/thelounge.nix diff --git a/profiles/web/services/trivial-gradios/default.nix b/profiles/http/services/trivial-gradios/default.nix similarity index 100% rename from profiles/web/services/trivial-gradios/default.nix rename to profiles/http/services/trivial-gradios/default.nix diff --git a/profiles/web/services/trivial-gradios/pkg/default.nix b/profiles/http/services/trivial-gradios/pkg/default.nix similarity index 100% rename from profiles/web/services/trivial-gradios/pkg/default.nix rename to profiles/http/services/trivial-gradios/pkg/default.nix diff --git a/profiles/web/services/vaultwarden.nix b/profiles/http/services/vaultwarden.nix similarity index 100% rename from profiles/web/services/vaultwarden.nix rename to profiles/http/services/vaultwarden.nix diff --git a/profiles/web/services/webdav-zotero.nix b/profiles/http/services/webdav-zotero.nix similarity index 100% rename from profiles/web/services/webdav-zotero.nix rename to profiles/http/services/webdav-zotero.nix diff --git a/profiles/web/sites/kuklefse.nix b/profiles/http/sites/kuklefse.nix similarity index 100% rename from profiles/web/sites/kuklefse.nix rename to profiles/http/sites/kuklefse.nix diff --git a/profiles/web/sites/linktree-pbsds.nix b/profiles/http/sites/linktree-pbsds.nix similarity index 100% rename from profiles/web/sites/linktree-pbsds.nix rename to profiles/http/sites/linktree-pbsds.nix diff --git a/profiles/web/sites/refleksjon-no.nix b/profiles/http/sites/refleksjon-no.nix similarity index 100% rename from profiles/web/sites/refleksjon-no.nix rename to profiles/http/sites/refleksjon-no.nix diff --git a/profiles/web/sites/roroslyd-no.nix b/profiles/http/sites/roroslyd-no.nix similarity index 100% rename from profiles/web/sites/roroslyd-no.nix rename to profiles/http/sites/roroslyd-no.nix diff --git a/profiles/web/todos.md b/profiles/http/todos.md similarity index 100% rename from profiles/web/todos.md rename to profiles/http/todos.md