diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale index 444b166b..c2b55e59 100755 --- a/src/freedombone-app-radicale +++ b/src/freedombone-app-radicale @@ -327,7 +327,7 @@ function install_radicale { echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} - echo ' location / {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} + echo ' location /radicale {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo " auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} @@ -345,7 +345,7 @@ function install_radicale { echo ' access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} - echo ' location / {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} + echo ' location /radicale {' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo " auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} echo ' proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} @@ -356,7 +356,14 @@ function install_radicale { else # alter the existing site config if ! grep "radicale" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}; then - sed -i '@server_name@a + sed -i '@443@a + location /radicale { + auth_basic "Radicale"; + auth_basic_user_file /var/www/radicale/users; + proxy_pass http://127.0.0.1:52322; + } +' /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME} + sed -i '@listen 127.0.0.1@a location /radicale { auth_basic "Radicale"; auth_basic_user_file /var/www/radicale/users;