From 7ccd58b50bbb4807c8fa3bf6c78fc9b7d2e48645 Mon Sep 17 00:00:00 2001
From: jdreichmann <johanna.reichmann@delta-industries.de>
Date: Sun, 28 Apr 2019 00:17:55 +0200
Subject: [PATCH] Housekeeping: add new host, correct some entries to FQDNs

---
 forward/public/.db.finallycoffee.eu.swp | Bin 0 -> 12288 bytes
 forward/public/db.finallycoffee.eu      |  34 +++++++++++++-----------
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 forward/public/.db.finallycoffee.eu.swp

diff --git a/forward/public/.db.finallycoffee.eu.swp b/forward/public/.db.finallycoffee.eu.swp
new file mode 100644
index 0000000000000000000000000000000000000000..8e434c0015907a5b43beca4662070931a3b5fedf
GIT binary patch
literal 12288
zcmeI2&u`;I6vwBPfSP6b%?+gChxj4UiS0O!lL(1YR!gOALG7{<(n{6D9w$~EJB%l3
zb6L291P3@EBqXjJI3jW409V8bPK#jw0wmZI;=tEQ+HHQhsl;W`So+ARXWpClzHern
zsM9pBZEaJJSp?U^gxvV~hwGhh8mqrPLWq()$$TD$B1%NwzTon?Y^DhdqlCxtz)xWy
znCQ*)zA@pj)QVIoNU~Cx%0n)LQn%NPBfk_h&-OIqT0hVVXa$NC=&5ksyGY8mW#-+U
zedcNU*rRV3S?D&cfL1^&pcT*xXa%$aS^=$qR^Wf8fa<Q0_mI=-IIqj&`^waP{HMNY
z1+)TM0j+>mKr5gX&<bb;v;tZIt$<cQD{vPozym_=xtEYv?nChS|Nrst|Jx4{@*Vgb
zybs!78<>EBb?_8;68!TZAveLd;8XAk_z-*mLg0Z5;FpVpd<7(U7rX`xum)~EK*-nN
z2pobd;0f?JFu)r4`vM_9f-gV|gy02m>wZFh2fu-zz?Yx{VsHT70qbBDtN;T3FbMe`
zd<H^bf)cpBM#x{_PjCx-47~g^^!W%3b-D}dtV7lcXa%$aT7myif&C5+#`%(mitQ`E
z%d(#AM|~c%ljnx9wPWn<UNbC{R;XR6xD|T9Wt_=gTg;quV`SQ+F9laoUle(C&*d>Y
z7=+wcsT`CU&gliJEt-O7Y9`R?`P_=W5`KG~w?tO#*E^Tr;LtWF{mlegD|FbPmpRJO
zqM49=Av2VJKMr_zRI&V%F<B(H?9xsziTw7Q`j8;?vnXRNuEZf9j7&FoHnuMrMP&`L
z_`D|L$ntDQ{ujm+bvfd=)3GR!2Hi?RiE_)HuX-{+)#*n|TjRv$(tR8Bb<r1b+U<x$
zQK5Vcg_EI?FPI;vy<pjhk2^1$-&+zZPzgG;%ZuINN=8TPQGhriH5k=>^zhVFGO6Q~
z>FDvCx{tj~7*AMxj^iyhCqV=mvIwVS$0IM7&T;1@tLwM<c?z^WRE9oJH&a3ybPo#z
z<-rPR^t)KZQ^$GPFo+FYhRsd8?%QUyUN+5g-SsL?y>1nn8CJE-Y^TPY3iE0hg3H#N
zGsBaExOGqXX1xsO^(r>2Gpr2Dt1!#9S*6OXic1<%8eoH-lL;2phEerc&0)6fG1n%9
zcQPepz&i`NkMnNUtEOkxEi;d)=KA58hNGwunPW1~#V?ZudrLkeiqtK%o02z9lVGm8
zr^c8Ox6o)>+k#DIn8>8M3+B>fCrrUN(oE&^FL$xCSGc8)yA+g-jJqt#>$rW9u=$$U
z;YmjfSH|$w@e(my)A3BxK$E~r0Iz1c$^EvVSFc_nhV582d)RvEs2fRv-4>Gy-w24|
zxz4a*S1384(aG}@f4d@-B5R*&vM>r3WyE8e^g2x;Uq)m8jUW@WIiM*H<-eNexcBCU
WF{>~S@Y<W5%=AU_9AX{kLH-4|x)sm>

literal 0
HcmV?d00001

diff --git a/forward/public/db.finallycoffee.eu b/forward/public/db.finallycoffee.eu
index d8aec99..05cdbab 100644
--- a/forward/public/db.finallycoffee.eu
+++ b/forward/public/db.finallycoffee.eu
@@ -11,7 +11,8 @@ $TTL	604800
 
 	IN	NS	munich.finallycoffee.eu.
 	IN	NS	london.finallycoffee.eu.
-	IN	NS	karlsruhe.finallycoffee.eu.
+	IN	NS	amsterdam.finallycoffee.eu.
+;	IN	NS	karlsruhe.finallycoffee.eu.
 
 ; Hosts
 
@@ -22,12 +23,15 @@ london.finallycoffee.eu.	IN	AAAA	2a06:8ec0:3::1:7fee
 munich.finallycoffee.eu.	IN	A	173.249.45.89
 munich.finallycoffee.eu.	IN	AAAA	2a02:c207:3003:6854::1
 
-iodine.finallycoffee.eu.	IN	A	78.94.228.62
-argon.finallycoffee.eu.		IN	A	185.122.57.156
-argon.finallycoffee.eu.		IN	AAAA	2a06:8ec0:3::1:7fee
+amsterdam.finallycoffee.eu.	IN	A	185.185.40.86
+amsterdam.finallycoffee.eu.	IN	AAAA	2a0b:7080:10::1:96cf
 
-vps.finallycoffee.eu.		IN	A	173.249.45.89
-vps.finallycoffee.eu.		IN	AAAA	2a02:c207:3003:6854::1
+;iodine.finallycoffee.eu.	IN	A	78.94.228.62
+;argon.finallycoffee.eu.		IN	A	185.122.57.156
+;argon.finallycoffee.eu.		IN	AAAA	2a06:8ec0:3::1:7fee
+
+;vps.finallycoffee.eu.		IN	A	173.249.45.89
+;vps.finallycoffee.eu.		IN	AAAA	2a02:c207:3003:6854::1
 
 ; Services
 
@@ -36,8 +40,8 @@ chat				IN	CNAME	karlsruhe.finallycoffee.eu.
 matrix				IN	CNAME	karlsruhe.finallycoffee.eu.
 dimension.matrix		IN	CNAME	karlsruhe.finallycoffee.eu.
 
-_matrix._tcp.matrix		IN	SRV	10 0 8448 matrix
-_matrix-identity._tcp.matrix	IN	SRV	10 0 443 matrix
+_matrix._tcp.matrix		IN	SRV	10 0 8448 matrix.finallycoffee.eu.
+_matrix-identity._tcp.matrix	IN	SRV	10 0 443 matrix.finallycoffee.eu.
 
 
 ; Private cloud
@@ -52,16 +56,16 @@ ci				IN	CNAME	karlsruhe.finallycoffee.eu.
 
 ; Infrastructure
 ipa				IN	CNAME	karlsruhe.finallycoffee.eu.
-ldap				IN	CNAME	vps.finallycoffee.eu.
+ldap				IN	CNAME	munich.finallycoffee.eu.
 dsl.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.
 docsis.gateway			IN	CNAME	karlsruhe.finallycoffee.eu.
 
-_ldap._tcp.ldap			IN	SRV	10 5 636 vps.finallycoffee.eu.
+_ldap._tcp.ldap			IN	SRV	10 5 636 munich.finallycoffee.eu.
 
 
 ; Gaming servers
-_minecraft._tcp.dw20.feedthebeast		IN	SRV	10 5 25569 karlsruhe.finallycoffee.eu
-_minecraft._tcp.sevtech-ages.feedthebeast	IN	SRV	10 5 25568 karlsruhe.finallycoffee.eu
-_minecraft._tcp.skyfactory3.feedthebeast	IN	SRV	10 5 25567 karlsruhe.finallycoffee.eu
-_minecraft._tcp.creative.minecraft		IN	SRV	10 5 25566 karlsruhe.finallycoffee.eu
-_minecraft._tcp.survival.minecraft		IN	SRV	10 5 25565 karlsruhe.finallycoffee.eu
+_minecraft._tcp.dw20.feedthebeast		IN	SRV	10 5 25569 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.sevtech-ages.feedthebeast	IN	SRV	10 5 25568 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.skyfactory3.feedthebeast	IN	SRV	10 5 25567 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.creative.minecraft		IN	SRV	10 5 25566 karlsruhe.finallycoffee.eu.
+_minecraft._tcp.survival.minecraft		IN	SRV	10 5 25565 karlsruhe.finallycoffee.eu.