diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /deployment/dns/templates/mageia.org.zone | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'deployment/dns/templates/mageia.org.zone')
| -rw-r--r-- | deployment/dns/templates/mageia.org.zone | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/deployment/dns/templates/mageia.org.zone b/deployment/dns/templates/mageia.org.zone index c2f24166..1dba603e 100644 --- a/deployment/dns/templates/mageia.org.zone +++ b/deployment/dns/templates/mageia.org.zone @@ -49,27 +49,27 @@ group IN MX 20 neru.mageia.org. nodes_txt += nodename + ' IN TXT "v=spf1 ' + spf + ' mx:mageia.org ~all" ' + "\n" } -%> -<%= @nodes_txt %> +<%= nodes_txt %> ;SSHFP ; sucuk -ns0 IN A <%= @nodes['sucuk']['ipv4'] %> -ns0 IN AAAA <%= @nodes['sucuk']['ipv6'] %> +ns0 IN A <%= nodes['sucuk']['ipv4'] %> +ns0 IN AAAA <%= nodes['sucuk']['ipv6'] %> ; neru -ns1 IN A <%= @nodes['neru']['ipv4'] %> -ns1 IN AAAA <%= @nodes['neru']['ipv6'] %> +ns1 IN A <%= nodes['neru']['ipv4'] %> +ns1 IN AAAA <%= nodes['neru']['ipv6'] %> ; mageia.org set to IP of neru -mageia.org. IN A <%= @nodes['neru']['ipv4'] %> -mageia.org. IN AAAA <%= @nodes['neru']['ipv6'] %> +mageia.org. IN A <%= nodes['neru']['ipv4'] %> +mageia.org. IN AAAA <%= nodes['neru']['ipv6'] %> ; madb on mageia.madb.org madb IN A 163.172.201.211 ; since we have a subdomain, we cannot use a CNAME -ml IN A <%= @nodes['sucuk']['ipv4'] %> -ml IN AAAA <%= @nodes['sucuk']['ipv6'] %> +ml IN A <%= nodes['sucuk']['ipv4'] %> +ml IN AAAA <%= nodes['sucuk']['ipv6'] %> ; aliases ldap-slave-1 IN CNAME neru @@ -108,7 +108,7 @@ forum IN CNAME sucuk bugs IN CNAME sucuk check IN CNAME sucuk gitweb IN CNAME sucuk -identity IN A <%= @nodes['sucuk']['ipv4'] %> +identity IN A <%= nodes['sucuk']['ipv4'] %> identity-trunk IN CNAME sucuk mirrors IN CNAME sucuk nav IN CNAME sucuk |