Преглед изворни кода

[unbound] Update service and unbound config

Colin Powell пре 1 година
родитељ
комит
40115b7df3

+ 7 - 8
lab/ansible/roles/unbound/files/service.zones

@@ -16,18 +16,17 @@ local-data: "snapcast.service   IN      A       192.168.40.56"
 local-data: "git.service        IN      A       192.168.40.140"
 local-data: "mopidy.service     IN      A       192.168.40.68"
 local-data: "vrobbler.service   IN      A       192.168.40.31"
+local-data: "syncthing.service  IN      A       192.168.40.91"
+local-data: "podcasts.service   IN      A       192.168.40.132"
+local-data: "rss.service        IN      A       192.168.40.151"
+local-data: "drone.service      IN      A       192.168.40.208"
+local-data: "librespot.service  IN      A       192.168.40.34"
+local-data: "calibre.service    IN      A       192.168.40.76"
+local-data: "emus.service       IN      A       192.168.40.163"
 
-local-data: "devpi.service      IN      A       192.168.40.11"
-local-data: "syncthing.service  IN      A       192.168.40.29"
-local-data: "podcasts.service   IN      A       192.168.40.45"
 local-data: "photos.service     IN      A       192.168.40.148"
-local-data: "drone.service      IN      A       192.168.40.208"
-local-data: "rss.service        IN      A       192.168.40.28"
 local-data: "paperless.service  IN      A       192.168.40.53"
 local-data: "wger.service       IN      A       192.168.40.250"
 local-data: "links.service      IN      A       192.168.40.242"
-local-data: "emus.service       IN      A       192.168.40.27"
 local-data: "pass.service       IN      A       192.168.40.30"
-local-data: "calibre.service    IN      A       192.168.40.70"
-local-data: "librespot.service  IN      A       192.168.40.231"
 local-data: "fittrackee.service IN      A       192.168.40.154"

+ 29 - 61
lab/ansible/roles/unbound/files/unblink.zones

@@ -6,64 +6,32 @@ local-data: "greip.unbl.ink     IN      A       198.244.198.117"
 local-data: "bt1.unbl.ink       IN      A       198.244.198.117"
 local-data: "bt2.unbl.ink       IN      A       198.12.85.133"
 local-data: "pandora.unbl.ink   IN      A       198.12.85.133"
-local-data: "pan.unbl.ink       IN      A       192.168.1.1"
-local-data: "pallene.unbl.ink   IN      A       192.168.1.2"
-local-data: "dns.unbl.ink       IN      A       192.168.1.239"
-local-data: "docdb.unbl.ink 	IN  	A	    192.168.1.131"
-local-data: "cache.unbl.ink     IN      A       192.168.1.233"
-local-data: "code.unbl.ink      IN	    A	    192.168.1.142"
-local-data: "mpd.unbl.ink       IN      A       192.168.1.195"
-local-data: "tor.unbl.ink       IN      A       192.168.1.127"
-local-data: "webcams.unbl.ink   IN      A       192.168.1.142"
-local-data: "podcasts.unbl.ink  IN      A       192.168.1.142"
-local-data: "photos.unbl.ink    IN      A       192.168.1.142"
-local-data: "play.unbl.ink      IN      A       192.168.1.142"
-local-data: "ci.unbl.ink        IN      A       192.168.1.142"
-local-data: "snap.unbl.ink      IN      A       192.168.1.142"
-local-data: "radio.unbl.ink     IN      A       192.168.1.142"
-local-data: "queue.unbl.ink     IN      A       192.168.1.142"
-local-data: "tracks.unbl.ink	IN	    A   	192.168.1.142"
-local-data: "s3.unbl.ink        IN      A       192.168.1.142"
-local-data: "ko.unbl.ink        IN      A       192.168.1.142"
-local-data: "console.s3.unbl.ink        IN      A       192.168.1.142"
-local-data: "tor.unbl.ink       IN      A       192.168.1.142"
-local-data: "mailhog.unbl.ink   IN      A       192.168.1.142"
-local-data: "smtp.unbl.ink	    IN	    A	    192.168.1.143"
-local-data: "null.unbl.ink      IN      A       192.168.1.142"
-local-data: "wx.unbl.ink        IN      A       192.168.1.142"
-local-data: "search.unbl.ink    IN      A       192.168.1.142"
-local-data: "kodi.unbl.ink      IN      A       192.168.1.142"
-local-data: "rss.unbl.ink       IN      A       192.168.1.142"
-local-data: "jelly.unbl.ink     IN      A       192.168.1.142"
-local-data: "db.unbl.ink        IN      A       192.168.1.107"
-local-data: "paper.unbl.ink     IN      A       192.168.1.142"
-local-data: "timelapse.unbl.ink IN      A       192.168.1.142"
-local-data: "geoloc.unbl.ink    IN      A       192.168.1.142"
-local-data: "cook.unbl.ink      IN      A       192.168.1.142"
-local-data: "kibana.unbl.ink    IN      A       192.168.1.142"
-local-data: "elastic.unbl.ink   IN      A       192.168.1.142"
-local-data: "logs.unbl.ink      IN      A       192.168.1.142"
-local-data: "draw.unbl.ink      IN      A       192.168.1.142"
-local-data: "notify.unbl.ink    IN      A       192.168.1.142"
-local-data: "base.unbl.ink      IN      A       192.168.1.142"
-local-data: "fit.unbl.ink       IN      A       192.168.1.142"
-local-data: "run.unbl.ink       IN      A       192.168.1.142"
-local-data: "watch.unbl.ink     IN      A       192.168.1.142"
-local-data: "links.unbl.ink     IN      A       192.168.1.142"
-local-data: "matrix.unbl.ink    IN      A       192.168.1.142"
-local-data: "mblog.unbl.ink     IN      A       192.168.1.142"
-local-data: "pypi.unbl.ink      IN      A       192.168.1.142"
-local-data: "reading.unbl.ink   IN      A       192.168.1.142"
-local-data: "xmpp.unbl.ink      IN      A       192.168.1.142"
-local-data: "bastion.unbl.ink   IN      A       192.168.1.142"
-local-data: "library.unbl.ink   IN      A       192.168.1.142"
-local-data: "navi.lab.unbl.ink  IN      A       192.168.1.142"
-local-data: "emus.lab.unbl.ink	IN	    A	    192.168.1.142"
-local-data: "mpd.lab.unbl.ink   IN      A       192.168.1.142"
-local-data: "play.lab.unbl.ink	IN	    A	    192.168.1.142"
-local-data: "scratch.lab.unbl.ink	IN	A	    192.168.1.142"
-local-data: "vrobbler.lab.unbl.ink  IN	A   	192.168.1.142"
-local-data: "library.lab.unbl.ink  IN	A   	192.168.1.142"
-local-data: "south.cam.timberwyckfarm.com       IN      A       192.168.1.142"
-local-data: "weather.cam.timberwyckfarm.com     IN      A       192.168.1.142"
-local-data: "unbl.ink	        IN  	A	    142.93.153.227"
+local-data: "dns.unbl.ink       IN      A       192.168.40.205"
+local-data: "cache.unbl.ink     IN      A       192.168.40.21"
+local-data: "code.unbl.ink      IN	    A	    192.168.40.169"
+local-data: "photos.unbl.ink    IN      A       192.168.40.169"
+local-data: "play.unbl.ink      IN      A       192.168.40.169"
+local-data: "snap.unbl.ink      IN      A       192.168.40.169"
+local-data: "s3.unbl.ink        IN      A       192.168.40.169"
+local-data: "wx.unbl.ink        IN      A       192.168.40.169"
+local-data: "jelly.unbl.ink     IN      A       192.168.40.169"
+local-data: "paper.unbl.ink     IN      A       192.168.40.169"
+local-data: "notify.unbl.ink    IN      A       192.168.40.169"
+local-data: "fit.unbl.ink       IN      A       192.168.40.169"
+local-data: "run.unbl.ink       IN      A       192.168.40.169"
+local-data: "links.unbl.ink     IN      A       192.168.40.169"
+local-data: "bastion.unbl.ink   IN      A       192.168.40.169"
+local-data: "ko.lab.unbl.ink    IN      A       192.168.40.169"
+local-data: "db.lab.unbl.ink    IN      A       192.168.40.169"
+local-data: "music.lab.unbl.ink IN      A       192.168.40.169"
+local-data: "emus.lab.unbl.ink	IN	    A	    192.168.40.169"
+local-data: "play.lab.unbl.ink	IN	    A	    192.168.40.169"
+local-data: "rss.lab.unbl.ink   IN      A       192.168.40.169"
+local-data: "east.cam.unbl.ink  IN      A       192.168.40.169"
+local-data: "west.cam.unbl.ink  IN      A       192.168.40.169"
+local-data: "ci.lab.unbl.ink              IN    A        192.168.40.169"
+local-data: "podcasts.lab.unbl.ink  	  IN    A        192.168.40.169"
+local-data: "console.s3.unbl.ink   	      IN    A        192.168.40.169"
+local-data: "vrobbler.lab.unbl.ink        IN    A   	 192.168.40.169"
+local-data: "library.lab.unbl.ink         IN	A   	 192.168.40.169"
+local-data: "unbl.ink	       IN   A	   142.93.153.227"

+ 2 - 1
lab/ansible/roles/unbound/files/unbound.conf

@@ -3,7 +3,7 @@ server:
 	verbosity: 1
 	num-threads: 4
 	interface: 0.0.0.0
-	access-control: 192.168.1.0/24 allow
+	access-control: 192.168.40.0/24 allow
 	cache-max-ttl: 14400
 	cache-min-ttl: 900
 	do-tcp: yes
@@ -27,6 +27,7 @@ server:
 	auto-trust-anchor-file: /usr/local/etc/unbound/root.key
 
 	include: /var/unbound/service.zones
+	include: /var/unbound/unblink.zones
 	include: /var/unbound/local-void.zones