diff --git a/tf/modules/ooni_backendproxy/main.tf b/tf/modules/ooni_backendproxy/main.tf index 91256bf..20a34e2 100644 --- a/tf/modules/ooni_backendproxy/main.tf +++ b/tf/modules/ooni_backendproxy/main.tf @@ -69,8 +69,6 @@ data "cloudinit_config" "ooni_backendproxy" { filename = "init.cfg" content_type = "text/cloud-config" content = templatefile("${path.module}/templates/cloud-init.yml", { - distro_id = "ubuntu", - distro_codename = "noble", wcth_addresses = var.wcth_addresses, wcth_domain_suffix = var.wcth_domain_suffix, backend_url = var.backend_url, diff --git a/tf/modules/ooni_backendproxy/templates/cloud-init.yml b/tf/modules/ooni_backendproxy/templates/cloud-init.yml index 384e4dc..dc5a027 100644 --- a/tf/modules/ooni_backendproxy/templates/cloud-init.yml +++ b/tf/modules/ooni_backendproxy/templates/cloud-init.yml @@ -2,22 +2,8 @@ package_update: true packages: - nginx - - unattended-upgrades write_files: - - path: /etc/apt/apt.conf.d/20auto-upgrades - content: | - APT::Periodic::Update-Package-Lists "1"; - APT::Periodic::Unattended-Upgrade "1"; - - - path: /etc/apt/apt.conf.d/50unattended-upgrades - content: | - Unattended-Upgrade::Allowed-Origins { - //"${distro_id} stable"; - "${distro_id} ${distro_codename}-security"; - "${distro_id} ${distro_codename}-updates"; - }; - - path: /etc/nginx/sites-available/default content: | %{ if length(wcth_addresses) > 0 }