diff --git a/common/server/drastikbot.nix b/common/server/drastikbot.nix index b812fb1..2952a02 100644 --- a/common/server/drastikbot.nix +++ b/common/server/drastikbot.nix @@ -68,7 +68,6 @@ in { enable = true; after = ["network.target"]; wantedBy = ["multi-user.target"]; - serviceConfig.ExecStartPre = ["${pkgs.coreutils}/bin/sleep 20"]; serviceConfig.ExecStart = "${drastikbot}/drastikbot -c ${cfg.dataDir}"; serviceConfig.User = cfg.user; serviceConfig.Group = cfg.group; diff --git a/flake.lock b/flake.lock index f868d50..480da75 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "dailybuild_modules": { "flake": false, "locked": { - "lastModified": 1630708165, - "narHash": "sha256-Oe1LszfWK4drG5seZbKcYDcb6XlGwTRH251xXd/GwRY=", + "lastModified": 1633210754, + "narHash": "sha256-jBIE07mLsF+qHoa/CQLSRipvfNSivgbuWUatI6Wwy0s=", "ref": "master", - "rev": "7915955afad2e9aee599946d324ce588a504f455", - "revCount": 8, + "rev": "e6a1c8686dad46b7847a5c690107a48fc20a6a29", + "revCount": 9, "type": "git", "url": "https://git.neet.dev/zuckerberg/dailybuild_modules.git" }, @@ -163,11 +163,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1633209822, - "narHash": "sha256-wQyQl7RkwAdyshaUdktoUPy0QLRdALcEIpI0vJHshhc=", + "lastModified": 1633210684, + "narHash": "sha256-/S8QePRyxmQlATVFpT0HtPGcJcpQHt8omtO1NW+EDME=", "ref": "main", - "rev": "b9b050fec1a4d74cae3e5e4ba7b88dd80627b521", - "revCount": 46, + "rev": "4255c43cf6efd8f145b8e87b3d5d584be32191b6", + "revCount": 47, "type": "git", "url": "https://git.neet.dev/zuckerberg/radio.git" }, diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix index 230fc1d..9214a38 100644 --- a/machines/liza/configuration.nix +++ b/machines/liza/configuration.nix @@ -164,18 +164,18 @@ in { networking.useHostResolvConf = false; services.resolved.enable = true; - services.drastikbot.enable = true; services.radio = { enable = true; host = "radio.neet.space"; }; - systemd.services.drastikbot.after = ["openvpn-us-east.service"]; }; }; }; # load the secret on behalf of the container age.secrets."pia-login.conf".file = ../../secrets/pia-login.conf; + services.drastikbot.enable = true; + # icecast endpoint + website services.nginx.virtualHosts."radio.neet.space" = { enableACME = true;