From f27e18b192ae517cdfa853e81cb8ef0de056369b Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Sun, 28 Feb 2021 20:53:46 -0500 Subject: [PATCH 1/6] Imported and converted civictech.ca DNS records from EasyDNS. --- README.md | 1 + civictech.ca./calgary.civictech.ca.yaml | 9 +++ civictech.ca./civictech.ca.yaml | 64 +++++++++++++++++++++ civictech.ca./edmonton.civictech.ca.yaml | 9 +++ civictech.ca./fredericton.civictech.ca.yaml | 9 +++ civictech.ca./link.civictech.ca.yaml | 9 +++ civictech.ca./london.civictech.ca.yaml | 6 ++ civictech.ca./ottawa.civictech.ca.yaml | 9 +++ civictech.ca./slack.civictech.ca.yaml | 8 +++ civictech.ca./toolkit.civictech.ca.yaml | 8 +++ civictech.ca./vancouver.civictech.ca.yaml | 9 +++ civictech.ca./waterloo.civictech.ca.yaml | 9 +++ config.yaml | 10 ++++ 13 files changed, 160 insertions(+) create mode 100644 civictech.ca./calgary.civictech.ca.yaml create mode 100644 civictech.ca./civictech.ca.yaml create mode 100644 civictech.ca./edmonton.civictech.ca.yaml create mode 100644 civictech.ca./fredericton.civictech.ca.yaml create mode 100644 civictech.ca./link.civictech.ca.yaml create mode 100644 civictech.ca./london.civictech.ca.yaml create mode 100644 civictech.ca./ottawa.civictech.ca.yaml create mode 100644 civictech.ca./slack.civictech.ca.yaml create mode 100644 civictech.ca./toolkit.civictech.ca.yaml create mode 100644 civictech.ca./vancouver.civictech.ca.yaml create mode 100644 civictech.ca./waterloo.civictech.ca.yaml diff --git a/README.md b/README.md index 1301dc2..defec74 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ The following damains can be managed here: - `c4nada.ca` - `t0ronto.ca` - `g0teborg.se` +- `civictech.ca` (pending) Changing or adding DNS records in `main` branch of this repository will update the actual domain records. diff --git a/civictech.ca./calgary.civictech.ca.yaml b/civictech.ca./calgary.civictech.ca.yaml new file mode 100644 index 0000000..7cecb7f --- /dev/null +++ b/civictech.ca./calgary.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +calgary: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://www.meetup.com/CivicTechYYC-Tech-for-Good/ + +yyc: + <<: *redirect diff --git a/civictech.ca./civictech.ca.yaml b/civictech.ca./civictech.ca.yaml new file mode 100644 index 0000000..98605c1 --- /dev/null +++ b/civictech.ca./civictech.ca.yaml @@ -0,0 +1,64 @@ +--- +'': + - type: TXT + values: + # Who has admin for this domain + - admin=civictechto + + # Email forwarding via forwardemail.net + # See: MX record below + + # hi@civictech.ca + - forward-email=hi:s2e1k1m0q5f0v3v6@civictechto.slack.com + - forward-email=hi:civictechtoronto@gmail.com + + # speakers@civictech.ca + - forward-email=speakers:civictechto-speakers@googlegroups.com + + # venues@civictech.ca + - forward-email=venues:civictechto-venues@googlegroups.com + + # codeacross@civictech.ca + - forward-email=codeacross:codeacross-toronto@googlegroups.com + + # eventscalendar@civictech.ca + - forward-email=eventscalendar:patrick.c.connolly@gmail.com + + # saintjohn@civictech.ca + - forward-email=saintjohn:patrick.c.connolly@gmail.com + + # organizers@civictech.ca + - forward-email=organizers:civictechto-organizers@googlegroups.com + + # sponsorship@civictech.ca + - forward-email=sponsorship:gabe@pwd.ca + + # toby@civictech.ca + - forward-email=toby:k2s3r7l0b4y6f2x7@civictechto.slack.com + + - type: A + value: 143.95.38.159 + metdata: + repository: none + maintainer: + - civictechto + + - type: MX + values: + # Allow use of forwardemail.net + # See: https://forwardemail.net/en/faq#how-do-i-get-started-and-set-up-email-forwarding + - exchange: mx1.forwardemail.net. + preference: 10 + - exchange: mx2.forwardemail.net. + preference: 10 + +www: &redirect + - type: CNAME + value: 301.ronny.tw. + octodns: + lenient: true + - type: TXT + value: 301 https://civictech.ca + +toronto: + <<: *redirect diff --git a/civictech.ca./edmonton.civictech.ca.yaml b/civictech.ca./edmonton.civictech.ca.yaml new file mode 100644 index 0000000..4864d67 --- /dev/null +++ b/civictech.ca./edmonton.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +edmonton: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://betacity.ca/ + +yeg: + <<: *redirect diff --git a/civictech.ca./fredericton.civictech.ca.yaml b/civictech.ca./fredericton.civictech.ca.yaml new file mode 100644 index 0000000..7ff649a --- /dev/null +++ b/civictech.ca./fredericton.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +fredericton: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://www.civictechfredericton.com/ + +freddy: + <<: *redirect diff --git a/civictech.ca./link.civictech.ca.yaml b/civictech.ca./link.civictech.ca.yaml new file mode 100644 index 0000000..3e10d1c --- /dev/null +++ b/civictech.ca./link.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +link: + - type: CNAME + value: rebrandlydomain.com. + metdata: + repository: https://github.com/civictechto/civictechto-scripts#gsheet2shortlinkspy + url: https://docs.google.com/spreadsheets/d/1LCVxEXuv70R-NozOwhNxZFtTZUmn1FLMPVD5wgIor9o/edit#gid=776462093 + maintainer: + - patcon diff --git a/civictech.ca./london.civictech.ca.yaml b/civictech.ca./london.civictech.ca.yaml new file mode 100644 index 0000000..d6274f7 --- /dev/null +++ b/civictech.ca./london.civictech.ca.yaml @@ -0,0 +1,6 @@ +--- +london: + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 http://civictechlondon.ca/ diff --git a/civictech.ca./ottawa.civictech.ca.yaml b/civictech.ca./ottawa.civictech.ca.yaml new file mode 100644 index 0000000..8adddd8 --- /dev/null +++ b/civictech.ca./ottawa.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +ottawa: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://ottawacivictech.ca/ + +yow: + <<: *redirect diff --git a/civictech.ca./slack.civictech.ca.yaml b/civictech.ca./slack.civictech.ca.yaml new file mode 100644 index 0000000..ca4ae38 --- /dev/null +++ b/civictech.ca./slack.civictech.ca.yaml @@ -0,0 +1,8 @@ +--- +slack: + type: CNAME + value: angular-temple-fx0lms4uzdcimvebrq3wtzg9.herokudns.com. + metadata: + repository: https://github.com/CivicTechTO/civictechto-slack-invite + maintainer: + - patcon diff --git a/civictech.ca./toolkit.civictech.ca.yaml b/civictech.ca./toolkit.civictech.ca.yaml new file mode 100644 index 0000000..0a75196 --- /dev/null +++ b/civictech.ca./toolkit.civictech.ca.yaml @@ -0,0 +1,8 @@ +--- +toolkit: + type: CNAME + value: encircled-perch-g73rg7yj4r18vg7e6r1xux3z.herokudns.com. + metadata: + repository: https://github.com/CivicTechTO/civictechto-community-toolkit + maintainer: + - patcon diff --git a/civictech.ca./vancouver.civictech.ca.yaml b/civictech.ca./vancouver.civictech.ca.yaml new file mode 100644 index 0000000..4a8dabd --- /dev/null +++ b/civictech.ca./vancouver.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +vancouver: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://www.meetup.com/Civic-Tech-Vancouver/ + +yvr: + <<: *redirect diff --git a/civictech.ca./waterloo.civictech.ca.yaml b/civictech.ca./waterloo.civictech.ca.yaml new file mode 100644 index 0000000..642544c --- /dev/null +++ b/civictech.ca./waterloo.civictech.ca.yaml @@ -0,0 +1,9 @@ +--- +waterloo: &redirect + - type: CNAME + value: 301.ronny.tw. + - type: TXT + value: 301 https://civictechwr.org/ + +wr: + <<: *redirect diff --git a/config.yaml b/config.yaml index ac714a5..004696a 100644 --- a/config.yaml +++ b/config.yaml @@ -7,9 +7,13 @@ providers: class: octodns.provider.yaml.SplitYamlProvider directory: . default_ttl: 120 +<<<<<<< HEAD # Suffix for each domain's dir (default: '.') extension: .domain # Allow record keys to be out of alphabetical order. +======= + # So YAML key order need not be alphabetical +>>>>>>> Imported and converted civictech.ca DNS records from EasyDNS. enforce_order: false # Error when dups found populate_should_replace: false @@ -47,3 +51,9 @@ zones: - config-files targets: - cloudflare + civictech.ca.: + lenient: true + sources: + - config-files + targets: + - cloudflare From 0a3f62b0af6fa96439f7f6f95d29ab8593aa64fe Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Sun, 28 Feb 2021 23:28:20 -0500 Subject: [PATCH 2/6] Oops. Fixed yaml aliases for redirects. --- civictech.ca./calgary.civictech.ca.yaml | 3 +-- civictech.ca./civictech.ca.yaml | 3 +-- civictech.ca./edmonton.civictech.ca.yaml | 3 +-- civictech.ca./fredericton.civictech.ca.yaml | 3 --- civictech.ca./ottawa.civictech.ca.yaml | 3 +-- civictech.ca./vancouver.civictech.ca.yaml | 3 +-- civictech.ca./waterloo.civictech.ca.yaml | 3 +-- 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/civictech.ca./calgary.civictech.ca.yaml b/civictech.ca./calgary.civictech.ca.yaml index 7cecb7f..8467a0f 100644 --- a/civictech.ca./calgary.civictech.ca.yaml +++ b/civictech.ca./calgary.civictech.ca.yaml @@ -5,5 +5,4 @@ calgary: &redirect - type: TXT value: 301 https://www.meetup.com/CivicTechYYC-Tech-for-Good/ -yyc: - <<: *redirect +yyc: *redirect diff --git a/civictech.ca./civictech.ca.yaml b/civictech.ca./civictech.ca.yaml index 98605c1..2b9788f 100644 --- a/civictech.ca./civictech.ca.yaml +++ b/civictech.ca./civictech.ca.yaml @@ -60,5 +60,4 @@ www: &redirect - type: TXT value: 301 https://civictech.ca -toronto: - <<: *redirect +toronto: *redirect diff --git a/civictech.ca./edmonton.civictech.ca.yaml b/civictech.ca./edmonton.civictech.ca.yaml index 4864d67..06337e3 100644 --- a/civictech.ca./edmonton.civictech.ca.yaml +++ b/civictech.ca./edmonton.civictech.ca.yaml @@ -5,5 +5,4 @@ edmonton: &redirect - type: TXT value: 301 https://betacity.ca/ -yeg: - <<: *redirect +yeg: *redirect diff --git a/civictech.ca./fredericton.civictech.ca.yaml b/civictech.ca./fredericton.civictech.ca.yaml index 7ff649a..985ce86 100644 --- a/civictech.ca./fredericton.civictech.ca.yaml +++ b/civictech.ca./fredericton.civictech.ca.yaml @@ -4,6 +4,3 @@ fredericton: &redirect value: 301.ronny.tw. - type: TXT value: 301 https://www.civictechfredericton.com/ - -freddy: - <<: *redirect diff --git a/civictech.ca./ottawa.civictech.ca.yaml b/civictech.ca./ottawa.civictech.ca.yaml index 8adddd8..debdfc5 100644 --- a/civictech.ca./ottawa.civictech.ca.yaml +++ b/civictech.ca./ottawa.civictech.ca.yaml @@ -5,5 +5,4 @@ ottawa: &redirect - type: TXT value: 301 https://ottawacivictech.ca/ -yow: - <<: *redirect +yow: *redirect diff --git a/civictech.ca./vancouver.civictech.ca.yaml b/civictech.ca./vancouver.civictech.ca.yaml index 4a8dabd..60d9f62 100644 --- a/civictech.ca./vancouver.civictech.ca.yaml +++ b/civictech.ca./vancouver.civictech.ca.yaml @@ -5,5 +5,4 @@ vancouver: &redirect - type: TXT value: 301 https://www.meetup.com/Civic-Tech-Vancouver/ -yvr: - <<: *redirect +yvr: *redirect diff --git a/civictech.ca./waterloo.civictech.ca.yaml b/civictech.ca./waterloo.civictech.ca.yaml index 642544c..dfb7c50 100644 --- a/civictech.ca./waterloo.civictech.ca.yaml +++ b/civictech.ca./waterloo.civictech.ca.yaml @@ -5,5 +5,4 @@ waterloo: &redirect - type: TXT value: 301 https://civictechwr.org/ -wr: - <<: *redirect +wr: *redirect From 777d05a40f199c0912b57da11c48a870227fb200 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Mon, 15 Mar 2021 01:30:46 -0400 Subject: [PATCH 3/6] Renamed civictech.ca dir as required. --- {civictech.ca. => civictech.ca.domain}/calgary.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/edmonton.civictech.ca.yaml | 0 .../fredericton.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/link.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/london.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/ottawa.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/slack.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/toolkit.civictech.ca.yaml | 0 .../vancouver.civictech.ca.yaml | 0 {civictech.ca. => civictech.ca.domain}/waterloo.civictech.ca.yaml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename {civictech.ca. => civictech.ca.domain}/calgary.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/edmonton.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/fredericton.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/link.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/london.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/ottawa.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/slack.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/toolkit.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/vancouver.civictech.ca.yaml (100%) rename {civictech.ca. => civictech.ca.domain}/waterloo.civictech.ca.yaml (100%) diff --git a/civictech.ca./calgary.civictech.ca.yaml b/civictech.ca.domain/calgary.civictech.ca.yaml similarity index 100% rename from civictech.ca./calgary.civictech.ca.yaml rename to civictech.ca.domain/calgary.civictech.ca.yaml diff --git a/civictech.ca./civictech.ca.yaml b/civictech.ca.domain/civictech.ca.yaml similarity index 100% rename from civictech.ca./civictech.ca.yaml rename to civictech.ca.domain/civictech.ca.yaml diff --git a/civictech.ca./edmonton.civictech.ca.yaml b/civictech.ca.domain/edmonton.civictech.ca.yaml similarity index 100% rename from civictech.ca./edmonton.civictech.ca.yaml rename to civictech.ca.domain/edmonton.civictech.ca.yaml diff --git a/civictech.ca./fredericton.civictech.ca.yaml b/civictech.ca.domain/fredericton.civictech.ca.yaml similarity index 100% rename from civictech.ca./fredericton.civictech.ca.yaml rename to civictech.ca.domain/fredericton.civictech.ca.yaml diff --git a/civictech.ca./link.civictech.ca.yaml b/civictech.ca.domain/link.civictech.ca.yaml similarity index 100% rename from civictech.ca./link.civictech.ca.yaml rename to civictech.ca.domain/link.civictech.ca.yaml diff --git a/civictech.ca./london.civictech.ca.yaml b/civictech.ca.domain/london.civictech.ca.yaml similarity index 100% rename from civictech.ca./london.civictech.ca.yaml rename to civictech.ca.domain/london.civictech.ca.yaml diff --git a/civictech.ca./ottawa.civictech.ca.yaml b/civictech.ca.domain/ottawa.civictech.ca.yaml similarity index 100% rename from civictech.ca./ottawa.civictech.ca.yaml rename to civictech.ca.domain/ottawa.civictech.ca.yaml diff --git a/civictech.ca./slack.civictech.ca.yaml b/civictech.ca.domain/slack.civictech.ca.yaml similarity index 100% rename from civictech.ca./slack.civictech.ca.yaml rename to civictech.ca.domain/slack.civictech.ca.yaml diff --git a/civictech.ca./toolkit.civictech.ca.yaml b/civictech.ca.domain/toolkit.civictech.ca.yaml similarity index 100% rename from civictech.ca./toolkit.civictech.ca.yaml rename to civictech.ca.domain/toolkit.civictech.ca.yaml diff --git a/civictech.ca./vancouver.civictech.ca.yaml b/civictech.ca.domain/vancouver.civictech.ca.yaml similarity index 100% rename from civictech.ca./vancouver.civictech.ca.yaml rename to civictech.ca.domain/vancouver.civictech.ca.yaml diff --git a/civictech.ca./waterloo.civictech.ca.yaml b/civictech.ca.domain/waterloo.civictech.ca.yaml similarity index 100% rename from civictech.ca./waterloo.civictech.ca.yaml rename to civictech.ca.domain/waterloo.civictech.ca.yaml From ed2434fd6d11ed93df38913af332aba38971fc8e Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Mon, 15 Mar 2021 01:34:01 -0400 Subject: [PATCH 4/6] Oops. Fixed yaml config. --- config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config.yaml b/config.yaml index 004696a..44068ff 100644 --- a/config.yaml +++ b/config.yaml @@ -7,13 +7,9 @@ providers: class: octodns.provider.yaml.SplitYamlProvider directory: . default_ttl: 120 -<<<<<<< HEAD # Suffix for each domain's dir (default: '.') extension: .domain # Allow record keys to be out of alphabetical order. -======= - # So YAML key order need not be alphabetical ->>>>>>> Imported and converted civictech.ca DNS records from EasyDNS. enforce_order: false # Error when dups found populate_should_replace: false From eb4e8fcf78438eb00ed483c3a8603b6b36927393 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Mon, 15 Mar 2021 01:39:16 -0400 Subject: [PATCH 5/6] Fixed the way make works in piping output. --- .github/workflows/domain-plan.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/domain-plan.yml b/.github/workflows/domain-plan.yml index b67cdc7..7e16936 100644 --- a/.github/workflows/domain-plan.yml +++ b/.github/workflows/domain-plan.yml @@ -49,7 +49,8 @@ jobs: run: make setup - name: Generate plan - run: make dry-run > octodns-sync.plan + # Use tail to trim the first line of make, where command is printed. + run: make dry-run | tail -n +2 > octodns-sync.plan - name: Get plan output id: plan From d52971ad50760a829f4fd671d3c60e7c89840c91 Mon Sep 17 00:00:00 2001 From: Patrick Connolly Date: Mon, 15 Mar 2021 01:48:41 -0400 Subject: [PATCH 6/6] Fixed output issue. --- .github/workflows/domain-plan.yml | 3 +-- Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/domain-plan.yml b/.github/workflows/domain-plan.yml index 7e16936..b67cdc7 100644 --- a/.github/workflows/domain-plan.yml +++ b/.github/workflows/domain-plan.yml @@ -49,8 +49,7 @@ jobs: run: make setup - name: Generate plan - # Use tail to trim the first line of make, where command is printed. - run: make dry-run | tail -n +2 > octodns-sync.plan + run: make dry-run > octodns-sync.plan - name: Get plan output id: plan diff --git a/Makefile b/Makefile index 3406d9c..b02b381 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ validate: ## Validate your configuration files @echo Config files successfully validated! dry-run: ## Dry-run DNS record update (SAFE) - $(RUN) octodns-sync --config-file config.yaml + @$(RUN) octodns-sync --config-file config.yaml run: check ## Run DNS record update (!!!) $(RUN) octodns-sync --config-file config.yaml --doit