Commit 728244ae authored by nanahira's avatar nanahira

updates

parent 6ded7cc6
...@@ -128,8 +128,8 @@ ...@@ -128,8 +128,8 @@
send host-name = gethostname(); send host-name = gethostname();
request subnet-mask, broadcast-address, routers; request subnet-mask, broadcast-address, routers;
bootp-broadcast-always; bootp-broadcast-always;
timeout 300; timeout {{dhcp_timeout | default(30)}};
retry {{dhcp_retry | default(60)}};
{% for br in bridges %} {% for br in bridges %}
{% if br.dhclient is defined and br.dhclient %} {% if br.dhclient is defined and br.dhclient %}
interface "{{br.name}}" { interface "{{br.name}}" {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- git-registry.moenext.com/railgun/ocserv - git-registry.moenext.com/railgun/ocserv
- git-registry.moenext.com/railgun/openconnect - git-registry.moenext.com/railgun/openconnect
- git-registry.moenext.com/nanahira/gost - git-registry.moenext.com/nanahira/gost
- git-registry.moenext.com/railgun/tun:new - git-registry.moenext.com/railgun/tun:rust
# - git-registry.moenext.com/railgun/railgun-routing-client # - git-registry.moenext.com/railgun/railgun-routing-client
- name: Add warp-proxy image to mcnetwork_docker_images if architecture is x86_64 - name: Add warp-proxy image to mcnetwork_docker_images if architecture is x86_64
set_fact: set_fact:
......
...@@ -18,6 +18,8 @@ vars: ...@@ -18,6 +18,8 @@ vars:
tag: 41 tag: 41
- link: bond0 - link: bond0
tag: 46 tag: 46
dhcp_timeout: 30 # DHCP超时
dhcp_retry: 60 # DHCP重试间隔
bridges: # bridge,IP只能在这里配 bridges: # bridge,IP只能在这里配
- name: brlan # 名称 - name: brlan # 名称
links: links:
......
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