diff --git a/configuration.nix b/configuration.nix index 8e5e1d8..d852247 100644 --- a/configuration.nix +++ b/configuration.nix @@ -41,18 +41,6 @@ ]; security.sudo.wheelNeedsPassword = true; - security.sudo.extraRules = [ - { - users = [ "reudy" ]; - commands = [ - { - command = "/run/current-system/sw/bin/systemctl reload caddy"; - options = [ "NOPASSWD" ]; - } - ]; - } - ]; - services.openssh = { enable = true; diff --git a/panel.nix b/panel.nix index a0a11cd..efa9701 100644 --- a/panel.nix +++ b/panel.nix @@ -11,14 +11,14 @@ users.users.caddy.extraGroups = [ "panelroutes" ]; systemd.tmpfiles.rules = [ - "d /var/lib/containers 0755 reudy panelroutes -" + "d /var/lib/containers 0750 reudy panelroutes -" "d /var/lib/containers/stacks 0750 reudy panelroutes -" "d /var/lib/containers/volumes 0750 reudy panelroutes -" - "d /var/lib/containers/routes 0755 reudy panelroutes -" + "d /var/lib/containers/routes 0750 reudy panelroutes -" "d /var/lib/containers/state 0750 reudy panelroutes -" "d /var/lib/containers/state/apps 0750 reudy panelroutes -" "d /var/lib/containers/backups 0750 reudy panelroutes -" - "f /var/lib/containers/routes/routes.caddy 0664 reudy panelroutes -" + "f /var/lib/containers/routes/routes.caddy 0640 reudy panelroutes -" ]; systemd.services.panel-api = { @@ -29,7 +29,6 @@ pkgs.podman pkgs.podman-compose pkgs.curl - pkgs.sudo pkgs.coreutils pkgs.zip pkgs.unzip @@ -41,7 +40,7 @@ Group = "panelroutes"; Restart = "always"; RestartSec = 3; - WorkingDirectory = "/home/reudy"; + WorkingDirectory = "/var/lib/containers"; ExecStart = "${pkgs.python3}/bin/python3 ${./panel/panel-api.py}"; }; diff --git a/panel/README.md b/panel/README.md index 13401a2..02ede16 100644 --- a/panel/README.md +++ b/panel/README.md @@ -69,9 +69,6 @@ panelctl remove whoami --keep-volumes # Remove app and all data panelctl remove whoami - -# If deploy says caddy reload needs root: -sudo systemctl reload caddy ``` ## Notes