loco-dns-config-charm

Merge ~sajoupa/loco-dns-config-charm:delegate-ubuntu.it into loco-dns-config-charm:main

  1. Git
  2. lp:~sajoupa/loco-dns-config-charm
  3. delegate-ubuntu.it
  4. Merge into main
Proposed by Laurent Sesquès
Status: Merged
Approved by: Laurent Sesquès
Approved revision: cc024701cf4aad0881dc8d803fe52a080a48e75b
Merged at revision: 53790141b152633fddc297f7d360995be9fa0801
Proposed branch: ~sajoupa/loco-dns-config-charm:delegate-ubuntu.it
Merge into: loco-dns-config-charm:main
Diff against target: 10 lines (+2/-0)
1 file modified
files/named.conf.loco.master (+2/-0)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot Approve
Review via email: mp+452907@code.launchpad.net

Commit message

update files/named.conf.loco.master to delegate ubuntu.it and kubuntu.it

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for axino

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Merge proposal is approved, but source revision has changed, setting status to needs review.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 53790141b152633fddc297f7d360995be9fa0801

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/named.conf.loco.master b/files/named.conf.loco.master
2index 1c6335b..3145c66 100644
3--- a/files/named.conf.loco.master
4+++ b/files/named.conf.loco.master
5@@ -251,3 +251,5 @@ zone ubuntu-zh.org { type master; file "/srv/dns/domains/db.ubuntu-zh.org"; allo
6 zone ubuntu-zm.org { type master; file "/srv/dns/domains/db.ubuntu-zm.org"; allow-update { key ubuntu-zm.org.; };};
7 zone ubuntu-zw.org { type master; file "/srv/dns/domains/db.ubuntu-zw.org"; allow-update { key ubuntu-zw.org.; };};
8 zone ubuconla.org { type master; file "/srv/dns/domains/db.ubuconla.org"; allow-update { key ubuconla.org.; };};
9+zone ubuntu.it { type master; file "/srv/dns/domains/db.ubuntu.it"; allow-update { key ubuntu.it.; };};
10+zone kubuntu.it { type master; file "/srv/dns/domains/db.kubuntu.it"; allow-update { key kubuntu.it.; };};

Subscribers

People subscribed via source and target branches