Pārlūkot izejas kodu

Also add radicale to onion site

Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
feccf85967
1 mainītis faili ar 10 papildinājumiem un 3 dzēšanām
  1. 10
    3
      src/freedombone-app-radicale

+ 10
- 3
src/freedombone-app-radicale Parādīt failu

327
             echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
327
             echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
328
             echo '    error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
328
             echo '    error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
329
             echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
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
             echo '        auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
331
             echo '        auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
332
             echo "        auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
332
             echo "        auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
333
             echo '        proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
333
             echo '        proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
345
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
345
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
346
         echo '    error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
346
         echo '    error_log /var/log/radicale/radicale.log warn;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
347
         echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
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
         echo '        auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
349
         echo '        auth_basic "Radicale";' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
350
         echo "        auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
350
         echo "        auth_basic_user_file ${RADICALE_USERS};" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
351
         echo '        proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
351
         echo '        proxy_pass http://localhost:52322;' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
356
     else
356
     else
357
         # alter the existing site config
357
         # alter the existing site config
358
         if ! grep "radicale" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}; then
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
     location /radicale {
367
     location /radicale {
361
         auth_basic "Radicale";
368
         auth_basic "Radicale";
362
         auth_basic_user_file /var/www/radicale/users;
369
         auth_basic_user_file /var/www/radicale/users;