Bob Mottram 8 years ago
parent
commit
850b9c1f4d

+ 2
- 11
src/freedombone-app-dokuwiki View File

@@ -336,11 +336,7 @@ function install_dokuwiki {
336 336
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
337 337
         echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
338 338
         echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
339
-        echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
340
-        echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
341
-        echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
342
-        echo '        allow all;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
343
-        echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
339
+        nginx_keybase $DOKUWIKI_DOMAIN_NAME
344 340
         echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
345 341
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
346 342
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
@@ -419,12 +415,7 @@ function install_dokuwiki {
419 415
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
420 416
     echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
421 417
     echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
422
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
423
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
424
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
425
-    echo '        allow all;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
426
-    echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
427
-    echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
418
+    nginx_keybase $DOKUWIKI_DOMAIN_NAME
428 419
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
429 420
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
430 421
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME

+ 2
- 10
src/freedombone-app-etherpad View File

@@ -538,11 +538,7 @@ function install_etherpad {
538 538
         echo '    proxy_buffering   off;' >> $etherpad_nginx_site
539 539
         echo '  }' >> $etherpad_nginx_site
540 540
         echo '' >> $etherpad_nginx_site
541
-        echo "  # make sure webfinger and other well known services aren't blocked" >> $etherpad_nginx_site
542
-        echo '  # by denying dot files and rewrite request to the front controller' >> $etherpad_nginx_site
543
-        echo '  location ^~ /.well-known/ {' >> $etherpad_nginx_site
544
-        echo '      allow all;' >> $etherpad_nginx_site
545
-        echo '  }' >> $etherpad_nginx_site
541
+        nginx_keybase $ETHERPAD_DOMAIN_NAME
546 542
         echo '}' >> $etherpad_nginx_site
547 543
     else
548 544
         echo -n '' > $etherpad_nginx_site
@@ -569,11 +565,7 @@ function install_etherpad {
569 565
     echo '    proxy_buffering   off;' >> $etherpad_nginx_site
570 566
     echo '  }' >> $etherpad_nginx_site
571 567
     echo '' >> $etherpad_nginx_site
572
-    echo "  # make sure webfinger and other well known services aren't blocked" >> $etherpad_nginx_site
573
-    echo '  # by denying dot files and rewrite request to the front controller' >> $etherpad_nginx_site
574
-    echo '  location ^~ /.well-known/ {' >> $etherpad_nginx_site
575
-    echo '      allow all;' >> $etherpad_nginx_site
576
-    echo '  }' >> $etherpad_nginx_site
568
+    nginx_keybase $ETHERPAD_DOMAIN_NAME
577 569
     echo '}' >> $etherpad_nginx_site
578 570
 
579 571
     function_check create_site_certificate

+ 2
- 10
src/freedombone-app-ghost View File

@@ -377,11 +377,7 @@ function install_ghost {
377 377
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
378 378
         echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
379 379
         echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
380
-        echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
381
-        echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
382
-        echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
383
-        echo '        allow all;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
384
-        echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
380
+        nginx_keybase $GHOST_DOMAIN_NAME
385 381
         echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
386 382
         echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
387 383
     else
@@ -415,11 +411,7 @@ function install_ghost {
415 411
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
416 412
     echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
417 413
     echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
418
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
419
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
420
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
421
-    echo '        allow all;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
422
-    echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
414
+    nginx_keybase ${GHOST_DOMAIN_NAME}
423 415
     echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
424 416
 
425 417
     function_check create_site_certificate

+ 3
- 10
src/freedombone-app-gnusocial View File

@@ -607,11 +607,7 @@ function install_gnusocial_main {
607 607
         echo '    deny all;' >> $gnusocial_nginx_site
608 608
         echo '  }' >> $gnusocial_nginx_site
609 609
         echo '' >> $gnusocial_nginx_site
610
-        echo "  # make sure webfinger and other well known services aren't blocked" >> $gnusocial_nginx_site
611
-        echo '  # by denying dot files and rewrite request to the front controller' >> $gnusocial_nginx_site
612
-        echo '  location ^~ /.well-known/ {' >> $gnusocial_nginx_site
613
-        echo '      allow all;' >> $gnusocial_nginx_site
614
-        echo '  }' >> $gnusocial_nginx_site
610
+        nginx_keybase $GNUSOCIAL_DOMAIN_NAME
615 611
         echo '}' >> $gnusocial_nginx_site
616 612
     else
617 613
         echo -n '' > $gnusocial_nginx_site
@@ -655,11 +651,8 @@ function install_gnusocial_main {
655 651
     echo '  location ~ /\.(ht|git) {' >> $gnusocial_nginx_site
656 652
     echo '    deny all;' >> $gnusocial_nginx_site
657 653
     echo '  }' >> $gnusocial_nginx_site
658
-    echo "  # make sure webfinger and other well known services aren't blocked" >> $gnusocial_nginx_site
659
-    echo '  # by denying dot files and rewrite request to the front controller' >> $gnusocial_nginx_site
660
-    echo '  location ^~ /.well-known/ {' >> $gnusocial_nginx_site
661
-    echo '      allow all;' >> $gnusocial_nginx_site
662
-    echo '  }' >> $gnusocial_nginx_site
654
+    echo '' >> $gnusocial_nginx_site
655
+    nginx_keybase $GNUSOCIAL_DOMAIN_NAME
663 656
     echo '}' >> $gnusocial_nginx_site
664 657
 
665 658
     function_check configure_php

+ 2
- 10
src/freedombone-app-gogs View File

@@ -493,11 +493,7 @@ function install_gogs {
493 493
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
494 494
         echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
495 495
         echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
496
-        echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
497
-        echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
498
-        echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
499
-        echo '        allow all;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
500
-        echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
496
+        nginx_keybase ${GIT_DOMAIN_NAME}
501 497
         echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
502 498
         echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
503 499
     else
@@ -531,11 +527,7 @@ function install_gogs {
531 527
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
532 528
     echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
533 529
     echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
534
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
535
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
536
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
537
-    echo '        allow all;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
538
-    echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
530
+    nginx_keybase ${GIT_DOMAIN_NAME}
539 531
     echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
540 532
 
541 533
     function_check configure_php

+ 2
- 10
src/freedombone-app-htmly View File

@@ -453,11 +453,7 @@ function install_htmly_website {
453 453
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
454 454
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
455 455
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
456
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
457
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
458
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
459
-    echo '        allow all;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
460
-    echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
456
+    nginx_keybase ${HTMLY_DOMAIN_NAME}
461 457
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
462 458
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
463 459
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
@@ -534,11 +530,7 @@ function install_htmly_website_onion {
534 530
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
535 531
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
536 532
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
537
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
538
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
539
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
540
-    echo '        allow all;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
541
-    echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
533
+    nginx_keybase ${HTMLY_DOMAIN_NAME}
542 534
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
543 535
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
544 536
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME

+ 2
- 12
src/freedombone-app-hubzilla View File

@@ -388,12 +388,7 @@ function install_hubzilla {
388 388
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
389 389
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
390 390
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
391
-        echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
392
-        echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
393
-        echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
394
-        echo '        allow all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
395
-        echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
396
-        echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
391
+        nginx_keybase ${HUBZILLA_DOMAIN_NAME}
397 392
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
398 393
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
399 394
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -461,12 +456,7 @@ function install_hubzilla {
461 456
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
462 457
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
463 458
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
464
-        echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
465
-        echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
466
-        echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
467
-        echo '        allow all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
468
-        echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
469
-        echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
459
+        nginx_keybase ${HUBZILLA_DOMAIN_NAME}
470 460
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
471 461
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
472 462
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME

+ 2
- 10
src/freedombone-app-lychee View File

@@ -258,11 +258,7 @@ function install_lychee_website {
258 258
     nginx_limits $LYCHEE_DOMAIN_NAME
259 259
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
260 260
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
261
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
262
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
263
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
264
-    echo '        allow all;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
265
-    echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
261
+    nginx_keybase ${LYCHEE_DOMAIN_NAME}
266 262
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
267 263
     echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
268 264
     echo '    # or a unix socket' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
@@ -328,11 +324,7 @@ function install_lychee_website_onion {
328 324
     nginx_limits $LYCHEE_DOMAIN_NAME
329 325
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
330 326
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
331
-    echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
332
-    echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
333
-    echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
334
-    echo '        allow all;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
335
-    echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
327
+    nginx_keybase ${LYCHEE_DOMAIN_NAME}
336 328
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
337 329
     echo '    # block these file types' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
338 330
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME

+ 2
- 10
src/freedombone-app-mailpile View File

@@ -324,11 +324,7 @@ function install_mailpile {
324 324
         echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $mailpile_nginx_site
325 325
         echo '  }' >> $mailpile_nginx_site
326 326
         echo '' >> $mailpile_nginx_site
327
-        echo "  # make sure webfinger and other well known services aren't blocked" >> $mailpile_nginx_site
328
-        echo '  # by denying dot files and rewrite request to the front controller' >> $mailpile_nginx_site
329
-        echo '  location ^~ /.well-known/ {' >> $mailpile_nginx_site
330
-        echo '      allow all;' >> $mailpile_nginx_site
331
-        echo '  }' >> $mailpile_nginx_site
327
+        nginx_keybase ${MAILPILE_DOMAIN_NAME}
332 328
         echo '}' >> $mailpile_nginx_site
333 329
     else
334 330
         echo -n '' > $mailpile_nginx_site
@@ -356,11 +352,7 @@ function install_mailpile {
356 352
     echo '    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;' >> $mailpile_nginx_site
357 353
     echo '  }' >> $mailpile_nginx_site
358 354
     echo '' >> $mailpile_nginx_site
359
-    echo "  # make sure webfinger and other well known services aren't blocked" >> $mailpile_nginx_site
360
-    echo '  # by denying dot files and rewrite request to the front controller' >> $mailpile_nginx_site
361
-    echo '  location ^~ /.well-known/ {' >> $mailpile_nginx_site
362
-    echo '      allow all;' >> $mailpile_nginx_site
363
-    echo '  }' >> $mailpile_nginx_site
355
+    nginx_keybase ${MAILPILE_DOMAIN_NAME}
364 356
     echo '}' >> $mailpile_nginx_site
365 357
 
366 358
     function_check create_site_certificate

+ 2
- 10
src/freedombone-app-postactiv View File

@@ -451,11 +451,7 @@ function install_postactiv_main {
451 451
         echo '    deny all;' >> $postactiv_nginx_site
452 452
         echo '  }' >> $postactiv_nginx_site
453 453
         echo '' >> $postactiv_nginx_site
454
-        echo "  # make sure webfinger and other well known services aren't blocked" >> $postactiv_nginx_site
455
-        echo '  # by denying dot files and rewrite request to the front controller' >> $postactiv_nginx_site
456
-        echo '  location ^~ /.well-known/ {' >> $postactiv_nginx_site
457
-        echo '      allow all;' >> $postactiv_nginx_site
458
-        echo '  }' >> $postactiv_nginx_site
454
+        nginx_keybase ${POSTACTIV_DOMAIN_NAME}
459 455
         echo '}' >> $postactiv_nginx_site
460 456
     else
461 457
         echo -n '' > $postactiv_nginx_site
@@ -500,11 +496,7 @@ function install_postactiv_main {
500 496
     echo '    deny all;' >> $postactiv_nginx_site
501 497
     echo '  }' >> $postactiv_nginx_site
502 498
     echo '' >> $postactiv_nginx_site
503
-    echo "  # make sure webfinger and other well known services aren't blocked" >> $postactiv_nginx_site
504
-    echo '  # by denying dot files and rewrite request to the front controller' >> $postactiv_nginx_site
505
-    echo '  location ^~ /.well-known/ {' >> $postactiv_nginx_site
506
-    echo '      allow all;' >> $postactiv_nginx_site
507
-    echo '  }' >> $postactiv_nginx_site
499
+    nginx_keybase ${POSTACTIV_DOMAIN_NAME}
508 500
     echo '}' >> $postactiv_nginx_site
509 501
 
510 502
     function_check configure_php

+ 23
- 0
src/freedombone-utils-web View File

@@ -138,6 +138,29 @@ function nginx_ssl {
138 138
     #nginx_stapling $1
139 139
 }
140 140
 
141
+function nginx_keybase {
142
+    # creates files suitable for keybase.io verification
143
+    domain_name=$1
144
+    filename=/etc/nginx/sites-available/$domain_name
145
+
146
+    echo '' >> $domain_name
147
+    echo "  # make sure webfinger and other well known services aren't blocked" >> $domain_name
148
+    echo '  # by denying dot files and rewrite request to the front controller' >> $domain_name
149
+    echo '  location ^~ /.well-known/ {' >> $domain_name
150
+    echo '      allow all;' >> $domain_name
151
+    echo '  }' >> $domain_name
152
+
153
+    if [ ! -d /var/www/${domain_name}/htdocs/.well-known ]; then
154
+        mkdir -p /var/www/${domain_name}/htdocs/.well-known
155
+    fi
156
+    if [ ! -f /var/www/${domain_name}/htdocs/keybase.txt ]; then
157
+        touch /var/www/${domain_name}/htdocs/keybase.txt
158
+    fi
159
+    if [ ! -f /var/www/${domain_name}/htdocs/.well-known/keybase.txt ]; then
160
+        touch /var/www/${domain_name}/htdocs/.well-known/keybase.txt
161
+    fi
162
+}
163
+
141 164
 # check an individual domain name
142 165
 function test_domain_name {
143 166
     if [ $1 ]; then