github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-19 13:01:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1349 from serghey-rodin/add-caa-record

Browse source 
Add CAA DNS record
This commit is contained in:
Serghey Rodin 2019-05-14 10:57:13 +03:00 • committed by GitHub
commit faf7612c7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/v-add-dns-record
View file

@ -45,10 +45,12 @@ if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then
fi fi
fi fi
dvalue=${dvalue//\"/} if [ $rtype != "CAA" ]; then
dvalue=${dvalue//\"/}
if [[ "$dvalue" =~ [\;[:space:]] ]]; then if [[ "$dvalue" =~ [\;[:space:]] ]]; then
dvalue='"'"$dvalue"'"' dvalue='"'"$dvalue"'"'
fi
fi fi
# Additional argument formatting # Additional argument formatting

2
func/main.sh
View file

@ -659,7 +659,7 @@ is_dbuser_format_valid() {
# DNS record type validator # DNS record type validator
is_dns_type_format_valid() { is_dns_type_format_valid() {
known_dnstype='A,AAAA,NS,CNAME,MX,TXT,SRV,DNSKEY,KEY,IPSECKEY,PTR,SPF,TLSA' known_dnstype='A,AAAA,NS,CNAME,MX,TXT,SRV,DNSKEY,KEY,IPSECKEY,PTR,SPF,TLSA,CAA'
if [ -z "$(echo $known_dnstype |grep -w $1)" ]; then if [ -z "$(echo $known_dnstype |grep -w $1)" ]; then
check_result $E_INVALID "invalid dns record type format :: $1" check_result $E_INVALID "invalid dns record type format :: $1"
fi fi

1
web/templates/admin/add_dns_rec.html
View file

@ -82,6 +82,7 @@
<option value="PTR" <?php if ($v_type == 'PTR') echo selected; ?>>PTR</option> <option value="PTR" <?php if ($v_type == 'PTR') echo selected; ?>>PTR</option>
<option value="SPF" <?php if ($v_type == 'SPF') echo selected; ?>>SPF</option> <option value="SPF" <?php if ($v_type == 'SPF') echo selected; ?>>SPF</option>
<option value="TLSA" <?php if ($v_type == 'TLSA') echo selected; ?>>TLSA</option> <option value="TLSA" <?php if ($v_type == 'TLSA') echo selected; ?>>TLSA</option>
<option value="CAA" <?php if ($v_type == 'CAA') echo selected; ?>>CAA</option>
</select> </select>
</td> </td>
</tr> </tr>