Browse Source

Fix appends

Bob Mottram 8 years ago
parent
commit
ef390c91bf
1 changed files with 2 additions and 14 deletions
  1. 2
    14
      src/freedombone-app-radicale

+ 2
- 14
src/freedombone-app-radicale View File

@@ -356,20 +356,8 @@ 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 '@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
367
-    location /radicale {
368
-        auth_basic "Radicale";
369
-        auth_basic_user_file /var/www/radicale/users;
370
-        proxy_pass http://127.0.0.1:52322;
371
-    }
372
-' /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
359
+            sed -i '/443/a    location \/radicale {\n        auth_basic "Radicale";\n        auth_basic_user_file \/var\/www\/radicale\/users;\n        proxy_pass http://127.0.0.1:52322;\n    }' /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
360
+            sed -i '/listen 127.0.0.1/a    location \/radicale {\n        auth_basic "Radicale";\n        auth_basic_user_file \/var\/www\/radicale\/users;\n        proxy_pass http://127.0.0.1:52322;\n    }' /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
373 361
         fi
374 362
     fi
375 363