Просмотр исходного кода

Read apache2 first instead nginx for well-known challenge.

(cherry picked from commit c04e68d9126c0e669614740f33ce4fdacb689555)
Raphael Schneeberger 6 лет назад
Родитель
Сommit
db58d15359
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      bin/v-add-letsencrypt-domain

+ 3 - 3
bin/v-add-letsencrypt-domain

@@ -253,12 +253,12 @@ for auth in $authz; do
             else
                 # Get root directory from configuration
                 domain_config="$HOMEDIR/$user/conf/web/$domain"
-                if [ -f "$domain_config/nginx.conf" ]; then
-                    well_known="$(cat $domain_config/nginx.conf | egrep '^\s+root'| \
+                if [ -f "$domain_config/apache2.conf" ]; then
+                    well_known="$(cat $domain_config/apache2.conf | egrep '^\s+root'| \
                                 awk '{split($0, a, " "); print a[2]}' | \
                                 sed 's/;$//')/.well-known"
                 else
-                    well_known="$(cat $domain_config/apache2.conf | egrep '^\s+root'| \
+                    well_known="$(cat $domain_config/nginx.conf | egrep '^\s+root'| \
                                 awk '{split($0, a, " "); print a[2]}' | \
                                 sed 's/;$//')/.well-known"
                 fi