|
@@ -327,7 +327,7 @@ function install_radicale {
|
327
|
327
|
echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
328
|
328
|
echo ' error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
329
|
329
|
echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
330
|
|
- echo ' location / {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
|
330
|
+ echo ' location /radicale {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
331
|
331
|
echo ' auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
332
|
332
|
echo " auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
333
|
333
|
echo ' proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
|
@@ -345,7 +345,7 @@ function install_radicale {
|
345
|
345
|
echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
346
|
346
|
echo ' error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
347
|
347
|
echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
348
|
|
- echo ' location / {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
|
348
|
+ echo ' location /radicale {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
349
|
349
|
echo ' auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
350
|
350
|
echo " auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
351
|
351
|
echo ' proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
|
@@ -356,7 +356,14 @@ function install_radicale {
|
356
|
356
|
else
|
357
|
357
|
# alter the existing site config
|
358
|
358
|
if ! grep "radicale" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}; then
|
359
|
|
- sed -i '@server_name@a
|
|
359
|
+ sed -i '@443@a
|
|
360
|
+ location /radicale {
|
|
361
|
+ auth_basic "Radicale";
|
|
362
|
+ auth_basic_user_file /var/www/radicale/users;
|
|
363
|
+ proxy_pass http://127.0.0.1:52322;
|
|
364
|
+ }
|
|
365
|
+' /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
|
|
366
|
+ sed -i '@listen 127.0.0.1@a
|
360
|
367
|
location /radicale {
|
361
|
368
|
auth_basic "Radicale";
|
362
|
369
|
auth_basic_user_file /var/www/radicale/users;
|