equal
deleted
inserted
replaced
94 DOMAIN_BASE=paivola |
94 DOMAIN_BASE=paivola |
95 |
95 |
96 # List of actual domains used; will be linked to $DOMAIN_BASE |
96 # List of actual domains used; will be linked to $DOMAIN_BASE |
97 DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi) |
97 DOMAINS=(paivola.fi paivola.net paivola.org paivola.info paivola.mobi xn--pivl-load8j.fi) |
98 |
98 |
99 # Names of dhcp hosts files |
99 # Names of dhcp conf files |
100 DHCP_HOSTS=(paivola veturi verstas) |
100 DHCP_CONFS=(paivola veturi verstas) |
101 |
101 |
102 ## Operate! |
102 ## Operate! |
103 # these functions are all defined in lib/update.operations |
103 # these functions are all defined in lib/update.operations |
104 |
104 |
105 # Update $ZONES/$DHCP host-files from $DATA |
105 # Update $ZONES/$DHCP host-files from $DATA |
188 done |
188 done |
189 } |
189 } |
190 |
190 |
191 # Update $DHCP files from $DATA/dhcp |
191 # Update $DHCP files from $DATA/dhcp |
192 function run_dhcp { |
192 function run_dhcp { |
193 log "Linking DHCP hosts..." |
193 log "Linking DHCP configs..." |
194 for hosts in "${DHCP_HOSTS[@]}"; do |
194 for conf in "${DHCP_CONFS[@]}"; do |
195 # hosts base |
195 # conf base |
196 link_dhcp_hosts $hosts |
196 check_dhcp_conf $conf |
197 check_dhcp_hosts $hosts |
197 link_dhcp_conf $conf |
198 done |
198 done |
199 |
199 |
200 log "Testing dhcp..." |
200 log "Testing dhcp..." |
|
201 # this is partially redundant with the above check_dhcp_hosts, but doesn't matter |
201 check_dhcp |
202 check_dhcp |
202 } |
203 } |
203 |
204 |
204 function run_deploy { |
205 function run_deploy { |
205 ## Reload zones |
206 ## Reload zones |