fix: caddy compile
This commit is contained in:
parent
422cefb45c
commit
3c2cfcd1d9
3 changed files with 19 additions and 4 deletions
|
|
@ -19,6 +19,7 @@ in
|
|||
../../nixos-modules/services/photoprism.nix
|
||||
../../nixos-modules/services/samba.nix
|
||||
../../nixos-modules/services/ssh.nix
|
||||
../../nixos-modules/services/caddy
|
||||
../../nixos-modules/system/agenix.nix
|
||||
../../nixos-modules/system/fs.nix
|
||||
../../nixos-modules/system/persist.nix
|
||||
|
|
@ -152,9 +153,7 @@ in
|
|||
};
|
||||
|
||||
systemd.services.caddy.serviceConfig.EnvironmentFile = config.age.secrets.ionos.path;
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
package = caddy-with-plugins;
|
||||
services.caddy = { # ragon.services.caddy is enabled
|
||||
globalConfig = ''
|
||||
acme_dns ionos {
|
||||
api_token "{$IONOS_API_KEY}"
|
||||
|
|
@ -205,6 +204,7 @@ in
|
|||
persist.extraDirectories = [ "/var/lib/syncthing" config.services.plex.dataDir "/var/lib/minecraft" "/var/lib/bzzt" ];
|
||||
|
||||
services = {
|
||||
caddy.enable = true;
|
||||
samba.enable = true;
|
||||
samba.shares = {
|
||||
TimeMachine = {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ caddy.override {
|
|||
|
||||
plugins = [
|
||||
"github.com/caddy-dns/ionos@751e8e24162290ee74bea465ae733a2bf49551a6"
|
||||
"github.com/caddy-dns/desec@e1e64971fe34c29ce3f4176464adb84d6890aa50"
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
|
@ -36,7 +37,7 @@ caddy.override {
|
|||
cp -r --reflink=auto . $out
|
||||
'';
|
||||
|
||||
outputHash = "sha256-QsGrtpBJ9b2Nn3i5mUHYA60481ceTJDeCRl0qL6OWlE=";
|
||||
outputHash = "sha256-r+FDV9mYhcMyysjMk91O6MIbsBkDMwvK4H1KGQ5ZrV8=";
|
||||
outputHashMode = "recursive";
|
||||
};
|
||||
|
||||
14
nixos-modules/services/caddy/default.nix
Normal file
14
nixos-modules/services/caddy/default.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{ config, pkgs, lib, ...}:
|
||||
let
|
||||
cfg = config.ragon.services.caddy;
|
||||
in
|
||||
{
|
||||
options.ragon.services.caddy.enable = lib.mkEnableOption "enables the caddy webserver";
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
package = import ./custom-caddy.nix { inherit pkgs; };
|
||||
};
|
||||
ragon.persist.extraDirectories = [ config.services.caddy.dataDir ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue