apacheconfig: *.conf matche aussi *.ssl.conf et *-certs.conf
This commit is contained in:
parent
95aa12fb25
commit
a2480ec269
19
apacheconfig
19
apacheconfig
|
@ -262,14 +262,17 @@ elif [ "$action" == new-site ]; then
|
||||||
ssltempl=
|
ssltempl=
|
||||||
certstempl=
|
certstempl=
|
||||||
wwwtempl=
|
wwwtempl=
|
||||||
array_from_lines templs "$(list_files "$templdir" "*SITE*.conf")"
|
array_from_lines clrtempls "$(list_files "$templdir" "*SITE*.conf")"
|
||||||
[ ${#templs[*]} -gt 0 ] && clrtempl="${templs[0]}"
|
array_from_lines ssltempls "$(list_files "$templdir" "*SITE*.ssl.conf")"
|
||||||
array_from_lines templs "$(list_files "$templdir" "*SITE*.ssl.conf")"
|
array_from_lines certstempls "$(list_files "$templdir" "*SITE*-certs.conf")"
|
||||||
[ ${#templs[*]} -gt 0 ] && ssltempl="${templs[0]}"
|
for xtempl in "${ssltempls[@]}" "${certstempls[@]}"; do
|
||||||
array_from_lines templs "$(list_files "$templdir" "*SITE*-certs.conf")"
|
array_del clrtempls "$xtempl"
|
||||||
[ ${#templs[*]} -gt 0 ] && certstempl="${templs[0]}"
|
done
|
||||||
array_from_lines templs "$(list_dirs "$templdir" "*SITE*")"
|
[ ${#clrtempls[*]} -gt 0 ] && clrtempl="${clrtempls[0]}"
|
||||||
[ ${#templs[*]} -gt 0 ] && wwwtempl="${templs[0]}"
|
[ ${#ssltempls[*]} -gt 0 ] && ssltempl="${ssltempls[0]}"
|
||||||
|
[ ${#certstempls[*]} -gt 0 ] && certstempl="${certstempls[0]}"
|
||||||
|
array_from_lines wwwtempls "$(list_dirs "$templdir" "*SITE*")"
|
||||||
|
[ ${#wwwtempls[*]} -gt 0 ] && wwwtempl="${wwwtempls[0]}"
|
||||||
|
|
||||||
found=
|
found=
|
||||||
for i in "$clrtempl" "$ssltempl" "$certstempl" "$wwwtempl"; do
|
for i in "$clrtempl" "$ssltempl" "$certstempl" "$wwwtempl"; do
|
||||||
|
|
Loading…
Reference in New Issue