Commit 63c770e6 authored by nanahira's avatar nanahira

Merge branch 'master' of git.mycard.moe:mycard/dnsmasq

parents 4d43d2e6 a335b06b
Pipeline #2987 passed with stages
in 3 minutes and 53 seconds
......@@ -68,6 +68,7 @@ dns-in-nextgen:
ansible_ssh_host: 10.198.0.3
ayumi:
ansible_python_interpreter: python3
ansible_ssh_user: nanahira
ansible_ssh_host: 10.198.0.11
yuzurisa.mycard.moe:
ansible_ssh_host: 10.198.0.7
......@@ -120,7 +121,6 @@ dns-in-nextgen:
ansible_ssh_user: nanahira
mathweb:
ansible_ssh_host: 10.198.35.1
ansible_ssh_user: mathweb
# ipset: true
jue:
ansible_ssh_host: 10.198.0.32
......
local=/yuzurisa.my-card.in/nomico.yuzurisa.com/yurika.yuzurisa.com/marcia.my-card.in/koikokoro.yuzurisa.com/
local=/zhenggu.my-card.in/zhenggu-idrac.my-card.in/
local=/zhenggu.my-card.in/zhenggu-idrac.my-card.in/riru.momobako.com/
host-record=yuzurisa.my-card.in,10.198.22.6
host-record=marcia.my-card.in,10.198.22.1
host-record=nomico.yuzurisa.com,10.198.22.18
......@@ -7,3 +7,4 @@ host-record=yurika.yuzurisa.com,10.198.22.20
host-record=koikokoro.yuzurisa.com,10.198.22.8
host-record=zhenggu-idrac.my-card.in,10.198.22.10
host-record=zhenggu.my-card.in,10.198.22.1
host-record=riru.momobako.com,10.198.22.25
......@@ -6,7 +6,7 @@ local=/wiki.my-card.in/cf.mycard.moe/poi.mycard.moe/
local=/railgun.ac/i.lv5.ac/radius.lv5.ac/
local=/mysql/mysql8/postgres/
local=/yunomi.mycard.moe/nanahira-pma.mycard.moe/
local=/www.touhou.cc/wool.my-card.in/
local=/www.touhou.cc/wool.my-card.in/social.wenaiwu.net/
#server=/lan/192.168.1.4
......@@ -52,3 +52,4 @@ host-record=pic.newwise.com,192.168.1.4
host-record=yunomi.mycard.moe,192.168.1.9
host-record=touhou.cc,www.touhou.cc,10.198.1.153
host-record=wool.my-card.in,192.168.1.10
host-record=social.wenaiwu.net,10.198.1.32
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment