Bob Mottram преди 8 години
родител
ревизия
70670d8000
променени са 1 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 6
    2
      src/freedombone-app-radicale

+ 6
- 2
src/freedombone-app-radicale Целия файл

304
         echo "    listen [::]:${RADICALE_PORT} ssl;" >> /etc/nginx/sites-available/radicale
304
         echo "    listen [::]:${RADICALE_PORT} ssl;" >> /etc/nginx/sites-available/radicale
305
         echo '' >> /etc/nginx/sites-available/radicale
305
         echo '' >> /etc/nginx/sites-available/radicale
306
         function_check nginx_ssl
306
         function_check nginx_ssl
307
-        nginx_ssl $DEFAULT_DOMAIN_NAME
307
+        nginx_ssl radicale
308
         function_check nginx_disable_sniffing
308
         function_check nginx_disable_sniffing
309
-        nginx_disable_sniffing $DEFAULT_DOMAIN_NAME
309
+        nginx_disable_sniffing radicale
310
         echo '' >> /etc/nginx/sites-available/radicale
310
         echo '' >> /etc/nginx/sites-available/radicale
311
         echo "    server_name $DEFAULT_DOMAIN_NAME;" >> /etc/nginx/sites-available/radicale
311
         echo "    server_name $DEFAULT_DOMAIN_NAME;" >> /etc/nginx/sites-available/radicale
312
 
312
 
337
     echo '    }' >> /etc/nginx/sites-available/radicale
337
     echo '    }' >> /etc/nginx/sites-available/radicale
338
     echo '}' >> /etc/nginx/sites-available/radicale
338
     echo '}' >> /etc/nginx/sites-available/radicale
339
 
339
 
340
+    sed -i "s|radicale.crt|${DEFAULT_DOMAIN_NAME}.crt|g" /etc/nginx/sites-available/radicale
341
+    sed -i "s|radicale.pem|${DEFAULT_DOMAIN_NAME}.pem|g" /etc/nginx/sites-available/radicale
342
+    sed -i "s|radicale.dhparam|${DEFAULT_DOMAIN_NAME}.dhparam|g" /etc/nginx/sites-available/radicale
343
+
340
     # create a certificate
344
     # create a certificate
341
     #if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
345
     #if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
342
     #    if [[ "$(cert_exists $DEFAULT_DOMAIN_NAME)" == "0" ]]; then
346
     #    if [[ "$(cert_exists $DEFAULT_DOMAIN_NAME)" == "0" ]]; then