diff options
| -rw-r--r-- | hiera/data/common.yaml | 2 | ||||
| -rw-r--r-- | modules/base/templates/hosts | 4 | ||||
| -rw-r--r-- | modules/headscale/templates/config.yaml | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/hiera/data/common.yaml b/hiera/data/common.yaml index 9c701d1..40c1648 100644 --- a/hiera/data/common.yaml +++ b/hiera/data/common.yaml @@ -3,7 +3,7 @@ default_user: doy vpn_ips: hornet: 100.64.0.1 tozt: 100.64.0.2 - oneplus-le2115: 100.64.0.3 + phone: 100.64.0.3 mail: 100.64.0.4 partofme: 100.64.0.5 diff --git a/modules/base/templates/hosts b/modules/base/templates/hosts index 63fe815..73bfc38 100644 --- a/modules/base/templates/hosts +++ b/modules/base/templates/hosts @@ -1,2 +1,6 @@ 127.0.0.1 localhost 127.0.1.1 <%= @hostname %>.localdomain <%= @hostname %> + +<% @vpn_ips.each do |hostname, ip| -%> +<%= ip %> <%= hostname %>.algo +<% end -%> diff --git a/modules/headscale/templates/config.yaml b/modules/headscale/templates/config.yaml index 91deed4..1a0152a 100644 --- a/modules/headscale/templates/config.yaml +++ b/modules/headscale/templates/config.yaml @@ -17,9 +17,3 @@ derp: disable_check_updates: true db_type: sqlite3 db_path: <%= @data_dir %>/db.sqlite -dns_config: - override_local_dns: true - nameservers: - - 4.2.2.4 - magic_dns: true - base_domain: headscale.tozt.net |