Merge branch 'develop' into neoloc/prometheus

2023-11-21 19:40:17 +11:00
parent a5207eb717 530ffed55a
commit 663b10e5a5
16 changed files with 34 additions and 20 deletions
@@ -0,0 +1 @@
+---
@@ -18,6 +18,13 @@ profiles::dns::resolver::zones:
    forwarders:
      - 10.10.8.1
    forward: 'only'
+  17.18.198.in-addr.arpa-forward:
+    domain: '17.18.198.in-addr.arpa'
+    zone_type: 'forward'
+    forwarders:
+      - 198.18.17.23
+      - 198.18.17.24
+    forward: 'only'

 profiles::dns::resolver::views:
  openforwarder:
@@ -25,5 +32,6 @@ profiles::dns::resolver::views:
    zones:
      - main.unkin.net-forward
      - prod.unkin.net-forward
+      - 17.18.198.in-addr.arpa-forward
    match_clients:
      - acl-main.unkin.net
@@ -9,8 +9,6 @@ profiles::puppet::autosign::domains:
 #  - 'somenode.main.unkin.net'

 profiles::puppet::enc::repo: https://git.unkin.net/unkinben/puppet-enc.git
-profiles::puppet::enc::release: '0.7'
-profiles::puppet::enc::force: true
 profiles::puppet::r10k::r10k_repo: https://git.unkin.net/unkinben/puppet-r10k.git
 profiles::puppet::g10k::bin_path: '/opt/puppetlabs/bin/g10k'
 profiles::puppet::g10k::cfg_path: '/etc/puppetlabs/r10k/r10k.yaml'