diff --git a/deploy.sh b/deploy.sh index 1d814fc..ef52ff2 100644 --- a/deploy.sh +++ b/deploy.sh @@ -722,7 +722,7 @@ cloudflare_dns_setup() { --data "{\"type\":\"A\",\"name\":\"${SUBDOMAIN}\",\"content\":\"${HOME_SERVER_IP}\",\"ttl\":1,\"proxied\":false}" | jq -r '.success') if [[ "${CREATION_STATUS}" == "true" ]]; then - echo " ✅ Successfully create a DNS record for ${SUBDOMAIN}" + echo " ✅ Successfully created a DNS record for ${SUBDOMAIN}" else echo -e " ❌ Failed to create a DNS record for ${SUBDOMAIN}. Check documentation to \n learn how you can create them manually." @@ -845,7 +845,7 @@ postrun_action() { REMOTE_PASS="changeMe!" echo -e "\n\n Now the remote machine will reboot. You will need to input the boot disk(s) passphrase. - This will be the only time you will have to do so, it will be automatic in the future." + This will be the only time you will have to do so, it will be automatic in the future." gum spin --title "Rebooting the remote..." -- sleep 120 diff --git a/templates/nix-config/misc/activation.nix b/templates/nix-config/misc/activation.nix index 147196c..bb7961a 100644 --- a/templates/nix-config/misc/activation.nix +++ b/templates/nix-config/misc/activation.nix @@ -17,7 +17,8 @@ exit 0 fi - mkdir -p /mnt/config/ /mnt/data/ /home/numbus-admin/.numbus-server/ + mkdir -p /mnt/config/ /mnt/data/ /mnt/data/nextcloud/ + mkdir -p /home/numbus-admin/.numbus-server/ chown -R numbus-admin:users /mnt/config/ chown -R numbus-admin:users /mnt/data/ chown -R 100032:users /mnt/data/nextcloud/ diff --git a/templates/nix-config/misc/networking.nix b/templates/nix-config/misc/networking.nix index db79c4d..a840b10 100644 --- a/templates/nix-config/misc/networking.nix +++ b/templates/nix-config/misc/networking.nix @@ -4,9 +4,8 @@ # Hostname networking.hostName = "numbus-server"; - networking.wireless.enable = false; networking.networkmanager.enable = false; - services.resolved.enable = false; + networking.resolvconf.enable = false; networking.nftables.enable = true; networking.firewall.enable = true; diff --git a/templates/nix-config/podman/gitea.nix b/templates/nix-config/podman/gitea.nix index 6fe2497..e9d434e 100644 --- a/templates/nix-config/podman/gitea.nix +++ b/templates/nix-config/podman/gitea.nix @@ -22,7 +22,6 @@ in gitea_backend: volumes: - ${config_dir}:/data - - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro environment: - USER_UID=1000 diff --git a/templates/nix-config/podman/pi-hole.nix b/templates/nix-config/podman/pi-hole.nix index d68acaa..d074635 100644 --- a/templates/nix-config/podman/pi-hole.nix +++ b/templates/nix-config/podman/pi-hole.nix @@ -49,7 +49,6 @@ in volumes: - ${config_dir}:/etc/pihole cap_add: - - NET_ADMIN - SYS_NICE labels: - traefik.enable=true @@ -75,7 +74,7 @@ in serviceConfig = { User = "numbus-admin"; Environment = [ "XDG_RUNTIME_DIR=/run/user/1000" ]; - AmbientCapabilities = "CAP_NET_ADMIN CAP_SYS_NICE"; + AmbientCapabilities = "CAP_SYS_NICE"; LimitNICE = -20; Type = "exec"; # Pull the latest image before running diff --git a/templates/podman-config/hass/configuration.yaml b/templates/podman-config/hass/configuration.yaml new file mode 100644 index 0000000..3d23803 --- /dev/null +++ b/templates/podman-config/hass/configuration.yaml @@ -0,0 +1,17 @@ + +# Loads default set of integrations. Do not remove. +default_config: + +# Load frontend themes from the themes folder +frontend: + themes: !include_dir_merge_named themes + +automation: !include automations.yaml +script: !include scripts.yaml +scene: !include scenes.yaml + +http: + use_x_forwarded_for: true + trusted_proxies: 172.16.10.253 + +zha: \ No newline at end of file