From 08cc82c0295564fc5717f9bf316327a0742701f6 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 9 May 2016 18:07:28 +0200 Subject: Relabel non-joker profiles. --- bind/fake-222/JONES-+source | 40 ------------------------------- bind/fake-222/JONES-+source+admin | 41 -------------------------------- bind/fake-222/JONES-www+source | 40 +++++++++++++++++++++++++++++++ bind/fake-222/JONES-www+source+admin | 41 ++++++++++++++++++++++++++++++++ bind/named.conf.fake-222 | 8 +++---- bind/named.conf.pri | 8 +++---- bind/pri/JONES-+source | 45 ----------------------------------- bind/pri/JONES-+source+admin | 46 ------------------------------------ bind/pri/JONES-www+source | 45 +++++++++++++++++++++++++++++++++++ bind/pri/JONES-www+source+admin | 46 ++++++++++++++++++++++++++++++++++++ 10 files changed, 180 insertions(+), 180 deletions(-) delete mode 100644 bind/fake-222/JONES-+source delete mode 100644 bind/fake-222/JONES-+source+admin create mode 100644 bind/fake-222/JONES-www+source create mode 100644 bind/fake-222/JONES-www+source+admin delete mode 100644 bind/pri/JONES-+source delete mode 100644 bind/pri/JONES-+source+admin create mode 100644 bind/pri/JONES-www+source create mode 100644 bind/pri/JONES-www+source+admin diff --git a/bind/fake-222/JONES-+source b/bind/fake-222/JONES-+source deleted file mode 100644 index 8908675..0000000 --- a/bind/fake-222/JONES-+source +++ /dev/null @@ -1,40 +0,0 @@ -$TTL 1w -@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h ) - -; Public zone roots, mailhubs and non-CNAME services (use A) - NS localhost. - A 192.168.222.250 ;188.183.5.254 - MX 5 xayide.jones.dk. - MX 10 perilin.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 mx -all" - TXT "v=spf1 mx -all" - -; External hosts (use A and TXT-wrapped CNAME or PTR) - -; Public local hosts (use A) - -; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) - -; Public CNAME-mapped PTR records - -; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" - -; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) - -; Public local services (use CNAME) -source CNAME xayide.jones.dk. -www CNAME xayide.jones.dk. - -; Private zone roots, mailhubs and non-CNAME services (use A) - -; Private hosts (use A) - -; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) - -; Private CNAME-mapped PTR records - -; Private services (use CNAME) - -; Private CNAME-mapped PTR records diff --git a/bind/fake-222/JONES-+source+admin b/bind/fake-222/JONES-+source+admin deleted file mode 100644 index 6831c9c..0000000 --- a/bind/fake-222/JONES-+source+admin +++ /dev/null @@ -1,41 +0,0 @@ -$TTL 1w -@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h ) - -; Public zone roots, mailhubs and non-CNAME services (use A) - NS localhost. - A 192.168.222.250 ;188.183.5.254 - MX 5 xayide.jones.dk. - MX 10 perilin.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 mx -all" - TXT "v=spf1 mx -all" - -; External hosts (use A and TXT-wrapped CNAME or PTR) - -; Public local hosts (use A) - -; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) - -; Public CNAME-mapped PTR records - -; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" - -; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) - -; Public local services (use CNAME) -admin CNAME xayide.jones.dk. -source CNAME xayide.jones.dk. -www CNAME xayide.jones.dk. - -; Private zone roots, mailhubs and non-CNAME services (use A) - -; Private hosts (use A) - -; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) - -; Private CNAME-mapped PTR records - -; Private services (use CNAME) - -; Private CNAME-mapped PTR records diff --git a/bind/fake-222/JONES-www+source b/bind/fake-222/JONES-www+source new file mode 100644 index 0000000..8908675 --- /dev/null +++ b/bind/fake-222/JONES-www+source @@ -0,0 +1,40 @@ +$TTL 1w +@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h ) + +; Public zone roots, mailhubs and non-CNAME services (use A) + NS localhost. + A 192.168.222.250 ;188.183.5.254 + MX 5 xayide.jones.dk. + MX 10 perilin.jones.dk. + MX 50 jawa.homebase.dk. + SPF "v=spf1 mx -all" + TXT "v=spf1 mx -all" + +; External hosts (use A and TXT-wrapped CNAME or PTR) + +; Public local hosts (use A) + +; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) + +; Public CNAME-mapped PTR records + +; Public authentication-related (LDAP and Kerberos) records +postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" + +; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) + +; Public local services (use CNAME) +source CNAME xayide.jones.dk. +www CNAME xayide.jones.dk. + +; Private zone roots, mailhubs and non-CNAME services (use A) + +; Private hosts (use A) + +; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) + +; Private CNAME-mapped PTR records + +; Private services (use CNAME) + +; Private CNAME-mapped PTR records diff --git a/bind/fake-222/JONES-www+source+admin b/bind/fake-222/JONES-www+source+admin new file mode 100644 index 0000000..6831c9c --- /dev/null +++ b/bind/fake-222/JONES-www+source+admin @@ -0,0 +1,41 @@ +$TTL 1w +@ IN SOA localhost. root.localhost. ( 1 1w 1d 30d 3h ) + +; Public zone roots, mailhubs and non-CNAME services (use A) + NS localhost. + A 192.168.222.250 ;188.183.5.254 + MX 5 xayide.jones.dk. + MX 10 perilin.jones.dk. + MX 50 jawa.homebase.dk. + SPF "v=spf1 mx -all" + TXT "v=spf1 mx -all" + +; External hosts (use A and TXT-wrapped CNAME or PTR) + +; Public local hosts (use A) + +; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) + +; Public CNAME-mapped PTR records + +; Public authentication-related (LDAP and Kerberos) records +postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" + +; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) + +; Public local services (use CNAME) +admin CNAME xayide.jones.dk. +source CNAME xayide.jones.dk. +www CNAME xayide.jones.dk. + +; Private zone roots, mailhubs and non-CNAME services (use A) + +; Private hosts (use A) + +; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) + +; Private CNAME-mapped PTR records + +; Private services (use CNAME) + +; Private CNAME-mapped PTR records diff --git a/bind/named.conf.fake-222 b/bind/named.conf.fake-222 index 54db365..31eb6e0 100644 --- a/bind/named.conf.fake-222 +++ b/bind/named.conf.fake-222 @@ -15,7 +15,7 @@ zone "bassballs.dk" { file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Anders Krøyer zone "couchdesign.dk" { type master; allow-transfer { none; }; - file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-+source"; }; // Jones + file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-www+source"; }; // Jones zone "feliciaweb.dk" { type master; allow-transfer { none; }; file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Anders Krøyer @@ -27,13 +27,13 @@ zone "kassandra-production.dk" { file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Annika Lewis (owner=Spiff) zone "majasguf.dk" { type master; allow-transfer { none; }; - file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-+source"; }; // Jones + file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-www+source"; }; // Jones zone "public-e.dk" { type master; allow-transfer { none; }; - file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-+source+admin"; }; // Sara Gebran + file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-www+source+admin"; }; // Sara Gebran zone "skovhaver.dk" { type master; allow-transfer { none; }; - file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-+source"; }; // Jones + file "/usr/local/etc-JONES.DK/bind/fake-222/JONES-www+source"; }; // Jones zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" { type master; allow-transfer { none; }; file "/usr/local/etc-JONES.DK/bind/fake-222/JONES"; }; // Jones diff --git a/bind/named.conf.pri b/bind/named.conf.pri index 8354972..b514fe7 100644 --- a/bind/named.conf.pri +++ b/bind/named.conf.pri @@ -13,7 +13,7 @@ zone "bassballs.dk" { file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Anders Krøyer zone "couchdesign.dk" { type master; allow-transfer { jones_peers; }; - file "/usr/local/etc-JONES.DK/bind/pri/JONES-+source"; }; // Jones + file "/usr/local/etc-JONES.DK/bind/pri/JONES-www+source"; }; // Jones zone "feliciaweb.dk" { type master; allow-transfer { jones_peers; }; file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Anders Krøyer @@ -25,13 +25,13 @@ zone "kassandra-production.dk" { file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Annika Lewis (owner=Spiff) zone "majasguf.dk" { type master; allow-transfer { jones_peers; }; - file "/usr/local/etc-JONES.DK/bind/pri/JONES-+source"; }; // Jones + file "/usr/local/etc-JONES.DK/bind/pri/JONES-www+source"; }; // Jones zone "public-e.dk" { type master; allow-transfer { jones_peers; }; - file "/usr/local/etc-JONES.DK/bind/pri/JONES-+source+admin"; }; // Sara Gebran + file "/usr/local/etc-JONES.DK/bind/pri/JONES-www+source+admin"; }; // Sara Gebran zone "skovhaver.dk" { type master; allow-transfer { jones_peers; }; - file "/usr/local/etc-JONES.DK/bind/pri/JONES-+source"; }; // Siri + file "/usr/local/etc-JONES.DK/bind/pri/JONES-www+source"; }; // Siri zone "xn--abcdefghijklmnopqrstuvxyz-0fc0a81c.dk" { type master; allow-transfer { jones_peers; }; file "/usr/local/etc-JONES.DK/bind/pri/JONES"; }; // Jones diff --git a/bind/pri/JONES-+source b/bind/pri/JONES-+source deleted file mode 100644 index c496f8d..0000000 --- a/bind/pri/JONES-+source +++ /dev/null @@ -1,45 +0,0 @@ -$TTL 1h -@ SOA dns.jones.dk. dr.jones.dk. ( - 2016042802 - 1h 30m 1w 1h ) - -; Public zone roots, mailhubs and non-CNAME services (use A) - NS dns.jones.dk. - NS ns.bitbase.dk. - NS ns.superserver.dk. - NS ns.homebase.dk. - A 188.183.5.254 - MX 5 xayide.jones.dk. - MX 10 perilin.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 -all" - TXT "v=spf1 -all" - -; External hosts (use A and TXT-wrapped CNAME or PTR) - -; Public local hosts (use A) - -; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) - -; Public CNAME-mapped PTR records - -; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" - -; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) - -; Public local services (use CNAME) -source CNAME xayide.jones.dk. -www CNAME xayide.jones.dk. - -; Private zone roots, mailhubs and non-CNAME services (use A) - -; Private hosts (use A) - -; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) - -; Private CNAME-mapped PTR records - -; Private services (use CNAME) - -; Private CNAME-mapped PTR records diff --git a/bind/pri/JONES-+source+admin b/bind/pri/JONES-+source+admin deleted file mode 100644 index 3b8b612..0000000 --- a/bind/pri/JONES-+source+admin +++ /dev/null @@ -1,46 +0,0 @@ -$TTL 1h -@ SOA dns.jones.dk. dr.jones.dk. ( - 2016042802 - 1h 30m 1w 1h ) - -; Public zone roots, mailhubs and non-CNAME services (use A) - NS dns.jones.dk. - NS ns.bitbase.dk. - NS ns.superserver.dk. - NS ns.homebase.dk. - A 188.183.5.254 - MX 5 xayide.jones.dk. - MX 10 perilin.jones.dk. - MX 50 jawa.homebase.dk. - SPF "v=spf1 -all" - TXT "v=spf1 -all" - -; External hosts (use A and TXT-wrapped CNAME or PTR) - -; Public local hosts (use A) - -; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) - -; Public CNAME-mapped PTR records - -; Public authentication-related (LDAP and Kerberos) records -postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" - -; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) - -; Public local services (use CNAME) -admin CNAME xayide.jones.dk. -source CNAME xayide.jones.dk. -www CNAME xayide.jones.dk. - -; Private zone roots, mailhubs and non-CNAME services (use A) - -; Private hosts (use A) - -; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) - -; Private CNAME-mapped PTR records - -; Private services (use CNAME) - -; Private CNAME-mapped PTR records diff --git a/bind/pri/JONES-www+source b/bind/pri/JONES-www+source new file mode 100644 index 0000000..c496f8d --- /dev/null +++ b/bind/pri/JONES-www+source @@ -0,0 +1,45 @@ +$TTL 1h +@ SOA dns.jones.dk. dr.jones.dk. ( + 2016042802 + 1h 30m 1w 1h ) + +; Public zone roots, mailhubs and non-CNAME services (use A) + NS dns.jones.dk. + NS ns.bitbase.dk. + NS ns.superserver.dk. + NS ns.homebase.dk. + A 188.183.5.254 + MX 5 xayide.jones.dk. + MX 10 perilin.jones.dk. + MX 50 jawa.homebase.dk. + SPF "v=spf1 -all" + TXT "v=spf1 -all" + +; External hosts (use A and TXT-wrapped CNAME or PTR) + +; Public local hosts (use A) + +; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) + +; Public CNAME-mapped PTR records + +; Public authentication-related (LDAP and Kerberos) records +postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" + +; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) + +; Public local services (use CNAME) +source CNAME xayide.jones.dk. +www CNAME xayide.jones.dk. + +; Private zone roots, mailhubs and non-CNAME services (use A) + +; Private hosts (use A) + +; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) + +; Private CNAME-mapped PTR records + +; Private services (use CNAME) + +; Private CNAME-mapped PTR records diff --git a/bind/pri/JONES-www+source+admin b/bind/pri/JONES-www+source+admin new file mode 100644 index 0000000..3b8b612 --- /dev/null +++ b/bind/pri/JONES-www+source+admin @@ -0,0 +1,46 @@ +$TTL 1h +@ SOA dns.jones.dk. dr.jones.dk. ( + 2016042802 + 1h 30m 1w 1h ) + +; Public zone roots, mailhubs and non-CNAME services (use A) + NS dns.jones.dk. + NS ns.bitbase.dk. + NS ns.superserver.dk. + NS ns.homebase.dk. + A 188.183.5.254 + MX 5 xayide.jones.dk. + MX 10 perilin.jones.dk. + MX 50 jawa.homebase.dk. + SPF "v=spf1 -all" + TXT "v=spf1 -all" + +; External hosts (use A and TXT-wrapped CNAME or PTR) + +; Public local hosts (use A) + +; Public wildcards of zone roots, hosts and non-CNAME services (use A and TXT or CNAME) + +; Public CNAME-mapped PTR records + +; Public authentication-related (LDAP and Kerberos) records +postfix._domainkey TXT "k=rsa;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCt3WEC7zyxmnI1No90K0obB9c2wxkO/GlqYpIwaM0yNm9skD5X8YFBdIZ6+mj725Pn3iiwg5DfMWT6z85255txg7z0Kh35UmMgZEZFvjckYQ/hEQ/6n9YZN6dIU9L0qRYdbolXP8FjJPrZRvzYXFKSBpLlx3u6NmizJqvdsrqz9QIDAQAB" + +; External services (use CNAME to local A, or A and TXT-wrapped CNAME, or CNAME if ok with partner) + +; Public local services (use CNAME) +admin CNAME xayide.jones.dk. +source CNAME xayide.jones.dk. +www CNAME xayide.jones.dk. + +; Private zone roots, mailhubs and non-CNAME services (use A) + +; Private hosts (use A) + +; Private wildcards of zone roots, hosts and non-CNAME services (use CNAME) + +; Private CNAME-mapped PTR records + +; Private services (use CNAME) + +; Private CNAME-mapped PTR records -- cgit v1.2.3