Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
N
nextgen-router
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
nextgen-router
Commits
89c9f06e
Commit
89c9f06e
authored
Dec 28, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add some services in dnsmasq
parent
d46abe3b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
0 deletions
+66
-0
files/dnsmasq/dnsmasq.conf.j2
files/dnsmasq/dnsmasq.conf.j2
+52
-0
files/services/docker-compose.yml.j2
files/services/docker-compose.yml.j2
+10
-0
variables.yaml
variables.yaml
+4
-0
No files found.
files/dnsmasq/dnsmasq.conf.j2
View file @
89c9f06e
...
@@ -24,3 +24,55 @@ dhcp-range=tag:{{br.name}},::,constructor:{{br.name}},ra-names,24h
...
@@ -24,3 +24,55 @@ dhcp-range=tag:{{br.name}},::,constructor:{{br.name}},ra-names,24h
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% if dnsmasq.kms is defined and dnsmasq.kms %}
# KMS
{% if dnsmasq.kms != "localhost" %}
srv-host=_vlmcs._tcp.lan,{{dnsmasq.kms}},1688,0,100
{% else %}
srv-host=_vlmcs._tcp.lan,{{services.address}},1688,0,100
{% endif %}
{% endif %}
{% if dnsmasq.aptCacher is defined and dnsmasq.aptCacher %}
# apt cacher
local=/archive.ubuntu.com/security.ubuntu.com/deb.debian.org/security.debian.org/
{% if dnsmasq.aptCacher != "localhost" %}
address=/archive.ubuntu.com/{{dnsmasq.aptCacher}}
host-record=security.ubuntu.com,deb.debian.org,security.debian.org,{{dnsmasq.aptCacher}}
{% else %}
address=/archive.ubuntu.com/{{services.address}}
host-record=security.ubuntu.com,deb.debian.org,security.debian.org,{{services.address}}
{% endif %}
{% endif %}
{% if dnsmasq.pxe is defined and dnsmasq.pxe %}
# PXE
{% if dnsmasq.pxe != "localhost" %}
dhcp-match=set:bios,60,PXEClient:Arch:00000
dhcp-boot=tag:bios,netboot.xyz.kpxe,,{{dnsmasq.pxe}}
dhcp-match=set:efi32,60,PXEClient:Arch:00002
dhcp-boot=tag:efi32,netboot.xyz.efi,,{{dnsmasq.pxe}}
dhcp-match=set:efi32-1,60,PXEClient:Arch:00006
dhcp-boot=tag:efi32-1,netboot.xyz.efi,,{{dnsmasq.pxe}}
dhcp-match=set:efi64,60,PXEClient:Arch:00007
dhcp-boot=tag:efi64,netboot.xyz.efi,,{{dnsmasq.pxe}}
dhcp-match=set:efi64-1,60,PXEClient:Arch:00008
dhcp-boot=tag:efi64-1,netboot.xyz.efi,,{{dnsmasq.pxe}}
dhcp-match=set:efi64-2,60,PXEClient:Arch:00009
dhcp-boot=tag:efi64-2,netboot.xyz.efi,,{{dnsmasq.pxe}}
{% else %}
dhcp-match=set:bios,60,PXEClient:Arch:00000
dhcp-boot=tag:bios,netboot.xyz.kpxe,,{{services.address}}
dhcp-match=set:efi32,60,PXEClient:Arch:00002
dhcp-boot=tag:efi32,netboot.xyz.efi,,{{services.address}}
dhcp-match=set:efi32-1,60,PXEClient:Arch:00006
dhcp-boot=tag:efi32-1,netboot.xyz.efi,,{{services.address}}
dhcp-match=set:efi64,60,PXEClient:Arch:00007
dhcp-boot=tag:efi64,netboot.xyz.efi,,{{services.address}}
dhcp-match=set:efi64-1,60,PXEClient:Arch:00008
dhcp-boot=tag:efi64-1,netboot.xyz.efi,,{{services.address}}
dhcp-match=set:efi64-2,60,PXEClient:Arch:00009
dhcp-boot=tag:efi64-2,netboot.xyz.efi,,{{services.address}}
{% endif %}
{% endif %}
files/services/docker-compose.yml.j2
View file @
89c9f06e
...
@@ -11,6 +11,16 @@ services:
...
@@ -11,6 +11,16 @@ services:
network_mode: host
network_mode: host
command: --remote-ip {{gdut.remote}} --keep-alive1-flag {{gdut.flag}} --enable-crypt 1
command: --remote-ip {{gdut.remote}} --keep-alive1-flag {{gdut.flag}} --enable-crypt 1
{% endif %}
{% endif %}
{% if dnsmasq.kms is defined and dnsmasq.kms == "localhost" %}
kms:
restart: always
image: teddysun/kms
volumes:
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
ports:
- '{{services.address}}:1688:1688'
{% endif %}
{% if services.ddns is defined and services.ddns %}
{% if services.ddns is defined and services.ddns %}
{% for instance in services.ddns %}
{% for instance in services.ddns %}
ddns-{{instance.name}}:
ddns-{{instance.name}}:
...
...
variables.yaml
View file @
89c9f06e
...
@@ -82,10 +82,14 @@ vars:
...
@@ -82,10 +82,14 @@ vars:
gfwlistIPSet
:
false
# 导入 gfwlist ipset
gfwlistIPSet
:
false
# 导入 gfwlist ipset
mycardDomains
:
false
# 导入 MCNetwork 内网域名
mycardDomains
:
false
# 导入 MCNetwork 内网域名
extraInterfaces
:
[]
# 额外监听的网卡
extraInterfaces
:
[]
# 额外监听的网卡
kms
:
localhost
# kms 服务器的地址,localhost 为自己搭建
aptCacher
:
10.0.0.2
# apt-cacher-ng 的地址
pxe
:
10.0.0.3
# pxe 服务器的地址
gdut
:
# 校园网特化使用
gdut
:
# 校园网特化使用
remote
:
10.0.3.6
remote
:
10.0.3.6
flag
:
2f
flag
:
2f
services
:
services
:
address
:
10.0.0.1
# 各内网服务主要监听的地址
ddns
:
ddns
:
-
name
:
test-ddns
-
name
:
test-ddns
email
:
name@example.com
# cf邮箱
email
:
name@example.com
# cf邮箱
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment