Browse Source

added vars for ddns

tags/v1.0.0
Robin Thoni 7 years ago
parent
commit
d861dfa3ca
6 changed files with 16 additions and 14 deletions
  1. 1
    0
      .gitignore
  2. 1
    0
      apache/vars-vars
  3. 6
    5
      env
  4. 6
    9
      isc-dhcp/dhcpd.conf
  5. 1
    0
      isc-dhcp/vars-vars
  6. 1
    0
      tftpd/vars-vars

+ 1
- 0
.gitignore View File

@@ -3,3 +3,4 @@ initrd.img
3 3
 vmlinuz
4 4
 *.swp
5 5
 docker-compose.override.yml
6
+env_override

+ 1
- 0
apache/vars-vars View File

@@ -2,6 +2,7 @@ DHCP_TSIG_KEY_NAME
2 2
 DHCP_TSIG_KEY_ALGO
3 3
 DHCP_TSIG_KEY_SECRET
4 4
 
5
+DHCP_DNS_MASTER
5 6
 DHCP_DNS_SERVER
6 7
 DHCP_TFTP_SERVER
7 8
 DHCP_ROUTERS

+ 6
- 5
env View File

@@ -1,14 +1,15 @@
1 1
 DHCP_TSIG_KEY_NAME=dhcpupdate
2
-DHCP_TSIG_KEY_ALGO=hmac-sha1
3
-DHCP_TSIG_KEY_SECRET=UmY/YecbaCwQ8hKHZxNJuudOC5kWeuW64Ohgvao8vUg=
2
+DHCP_TSIG_KEY_ALGO=hmac-md5
3
+DHCP_TSIG_KEY_SECRET=Y2hhbmdlX2l0
4 4
 
5
+DHCP_DNS_MASTER=10.15.100.1
5 6
 DHCP_DNS_SERVER=10.15.100.1
6 7
 DHCP_TFTP_SERVER=10.15.100.1
7 8
 DHCP_ROUTERS=10.15.100.1
8 9
 
9
-DHCP_DOMAIN=rthoni.com
10
-DHCP_SITE_DOMAIN=site.rthoni.com
11
-DHCP_DYN_IPS_DOMAIN=dhcp.site.rthoni.com
10
+DHCP_DOMAIN=example.com
11
+DHCP_SITE_DOMAIN=site.example.com
12
+DHCP_DYN_IPS_DOMAIN=dhcp.site.example.com
12 13
 DHCP_REV_DOMAIN=100.15.10.in-addr.arpa.
13 14
 
14 15
 DHCP_SUBNET=10.15.100.0

+ 6
- 9
isc-dhcp/dhcpd.conf View File

@@ -5,18 +5,18 @@ key DHCP_TSIG_KEY_NAME {
5 5
 };
6 6
 
7 7
 zone DHCP_DYN_IPS_DOMAIN {
8
-    primary DHCP_DNS_SERVER;
9
-    #key DHCP_TSIG_KEY_NAME;
8
+    primary DHCP_DNS_MASTER;
9
+    key DHCP_TSIG_KEY_NAME;
10 10
 }
11 11
 
12 12
 zone DHCP_SITE_DOMAIN {
13
-    primary DHCP_DNS_SERVER;
14
-    #key DHCP_TSIG_KEY_NAME;
13
+    primary DHCP_DNS_MASTER;
14
+    key DHCP_TSIG_KEY_NAME;
15 15
 }
16 16
 
17 17
 zone DHCP_REV_DOMAIN {
18
-    primary DHCP_DNS_SERVER;
19
-    #key DHCP_TSIG_KEY_NAME;
18
+    primary DHCP_DNS_MASTER;
19
+    key DHCP_TSIG_KEY_NAME;
20 20
 }
21 21
 
22 22
 
@@ -89,11 +89,8 @@ subnet DHCP_SUBNET netmask DHCP_NETMASK {
89 89
 
90 90
   # Force a default hostname if not present
91 91
   if option dhcp-message-type = 3 and not exists host-name and config-option host-name = null {
92
-    #ddns-hostname = concat("dyn-", binary-to-ascii(10, 8, "-", leased-address));
93
-    #option host-name = ddns-hostname;
94 92
     option host-name = concat("dyn-", binary-to-ascii(10, 8, "-", leased-address));
95 93
     ddns-hostname = config-option host-name;
96
-    #log(info, concat("Defaulting hostname to ", config-option host-name, " for ", binary-to-ascii(16, 8, ":", hardware)));
97 94
   }
98 95
 }
99 96
 

+ 1
- 0
isc-dhcp/vars-vars View File

@@ -2,6 +2,7 @@ DHCP_TSIG_KEY_NAME
2 2
 DHCP_TSIG_KEY_ALGO
3 3
 DHCP_TSIG_KEY_SECRET
4 4
 
5
+DHCP_DNS_MASTER
5 6
 DHCP_DNS_SERVER
6 7
 DHCP_TFTP_SERVER
7 8
 DHCP_ROUTERS

+ 1
- 0
tftpd/vars-vars View File

@@ -2,6 +2,7 @@ DHCP_TSIG_KEY_NAME
2 2
 DHCP_TSIG_KEY_ALGO
3 3
 DHCP_TSIG_KEY_SECRET
4 4
 
5
+DHCP_DNS_MASTER
5 6
 DHCP_DNS_SERVER
6 7
 DHCP_TFTP_SERVER
7 8
 DHCP_ROUTERS

Loading…
Cancel
Save