Browse Source

Retire support for keybase.io gpg version 2.x doesn't appear to work well with it, but beyond that there's the really concerning issue that the site asks users to upload their *private keys*. Even if the private keys are client side passphrase encrypted this gives that site a full time opportunity to crack private keys. Even if they don't so that, a leak happens and suddenly letter agencies have your private key. Not a good way to go.

Bob Mottram 7 years ago
parent
commit
f410d0a13f

+ 0
- 3
src/freedombone-app-dokuwiki View File

387
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
387
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
388
         echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
388
         echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
389
         echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
389
         echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
390
-        nginx_keybase $DOKUWIKI_DOMAIN_NAME
391
-        echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
392
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
390
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
393
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
391
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
394
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
392
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
467
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
465
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
468
     echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
466
     echo '    }' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
469
     echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
467
     echo '' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
470
-    nginx_keybase $DOKUWIKI_DOMAIN_NAME
471
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
468
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
472
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
469
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
473
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
470
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-etherpad View File

573
         echo '    proxy_set_header  Host $host;' >> $etherpad_nginx_site
573
         echo '    proxy_set_header  Host $host;' >> $etherpad_nginx_site
574
         echo '    proxy_buffering   off;' >> $etherpad_nginx_site
574
         echo '    proxy_buffering   off;' >> $etherpad_nginx_site
575
         echo '  }' >> $etherpad_nginx_site
575
         echo '  }' >> $etherpad_nginx_site
576
-        echo '' >> $etherpad_nginx_site
577
-        nginx_keybase $ETHERPAD_DOMAIN_NAME
578
         echo '}' >> $etherpad_nginx_site
576
         echo '}' >> $etherpad_nginx_site
579
     else
577
     else
580
         echo -n '' > $etherpad_nginx_site
578
         echo -n '' > $etherpad_nginx_site
600
     echo '    proxy_set_header  Host $host;' >> $etherpad_nginx_site
598
     echo '    proxy_set_header  Host $host;' >> $etherpad_nginx_site
601
     echo '    proxy_buffering   off;' >> $etherpad_nginx_site
599
     echo '    proxy_buffering   off;' >> $etherpad_nginx_site
602
     echo '  }' >> $etherpad_nginx_site
600
     echo '  }' >> $etherpad_nginx_site
603
-    echo '' >> $etherpad_nginx_site
604
-    nginx_keybase $ETHERPAD_DOMAIN_NAME
605
     echo '}' >> $etherpad_nginx_site
601
     echo '}' >> $etherpad_nginx_site
606
 
602
 
607
     function_check create_site_certificate
603
     function_check create_site_certificate

+ 0
- 4
src/freedombone-app-friendica View File

427
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
427
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
428
         echo '    }' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
428
         echo '    }' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
429
         echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
429
         echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
430
-        nginx_keybase ${FRIENDICA_DOMAIN_NAME}
431
-        echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
432
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
430
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
433
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
431
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
434
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
432
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
496
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
494
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
497
         echo '    }' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
495
         echo '    }' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
498
         echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
496
         echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
499
-        nginx_keybase ${FRIENDICA_DOMAIN_NAME}
500
-        echo '' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
501
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
497
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
502
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
498
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
503
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
499
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-ghost View File

471
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
471
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
472
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
472
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
473
         echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
473
         echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
474
-        echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
475
-        nginx_keybase $GHOST_DOMAIN_NAME
476
         echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
474
         echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
477
         echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
475
         echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
478
     else
476
     else
505
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
503
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
506
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
504
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
507
     echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
505
     echo '    }' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
508
-    echo '' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
509
-    nginx_keybase ${GHOST_DOMAIN_NAME}
510
     echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
506
     echo '}' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
511
 
507
 
512
     function_check create_site_certificate
508
     function_check create_site_certificate

+ 0
- 4
src/freedombone-app-gnusocial View File

738
         echo '  location ~ /\.(ht|git) {' >> $gnusocial_nginx_site
738
         echo '  location ~ /\.(ht|git) {' >> $gnusocial_nginx_site
739
         echo '    deny all;' >> $gnusocial_nginx_site
739
         echo '    deny all;' >> $gnusocial_nginx_site
740
         echo '  }' >> $gnusocial_nginx_site
740
         echo '  }' >> $gnusocial_nginx_site
741
-        echo '' >> $gnusocial_nginx_site
742
-        # DO NOT ENABLE KEYBASE. gnusocial really doesn't like having a .well-known directory
743
         echo '}' >> $gnusocial_nginx_site
741
         echo '}' >> $gnusocial_nginx_site
744
     else
742
     else
745
         echo -n '' > $gnusocial_nginx_site
743
         echo -n '' > $gnusocial_nginx_site
787
     echo '  location ~ /\.(ht|git) {' >> $gnusocial_nginx_site
785
     echo '  location ~ /\.(ht|git) {' >> $gnusocial_nginx_site
788
     echo '    deny all;' >> $gnusocial_nginx_site
786
     echo '    deny all;' >> $gnusocial_nginx_site
789
     echo '  }' >> $gnusocial_nginx_site
787
     echo '  }' >> $gnusocial_nginx_site
790
-    echo '' >> $gnusocial_nginx_site
791
-    # DO NOT ENABLE KEYBASE. gnusocial really doesn't like having a .well-known directory
792
     echo '}' >> $gnusocial_nginx_site
788
     echo '}' >> $gnusocial_nginx_site
793
 
789
 
794
     function_check configure_php
790
     function_check configure_php

+ 0
- 4
src/freedombone-app-gogs View File

601
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
601
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
602
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
602
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
603
         echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
603
         echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
604
-        echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
605
-        nginx_keybase ${GIT_DOMAIN_NAME}
606
         echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
604
         echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
607
         echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
605
         echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
608
     else
606
     else
635
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
633
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
636
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
634
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
637
     echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
635
     echo '    }' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
638
-    echo '' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
639
-    nginx_keybase ${GIT_DOMAIN_NAME}
640
     echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
636
     echo '}' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
641
 
637
 
642
     function_check configure_php
638
     function_check configure_php

+ 0
- 4
src/freedombone-app-htmly View File

463
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
463
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
464
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
464
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
465
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
465
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
466
-    nginx_keybase ${HTMLY_DOMAIN_NAME}
467
-    echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
468
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
466
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
469
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
467
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
470
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
468
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
541
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
539
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
542
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
540
     echo '    }' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
543
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
541
     echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
544
-    nginx_keybase ${HTMLY_DOMAIN_NAME}
545
-    echo '' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
546
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
542
     echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
547
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
543
     echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
548
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
544
     echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-hubzilla View File

431
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
431
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
432
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
432
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
433
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
433
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
434
-        nginx_keybase ${HUBZILLA_DOMAIN_NAME}
435
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
436
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
434
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
437
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
435
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
438
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
436
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
500
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
498
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
501
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
499
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
502
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
500
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
503
-        nginx_keybase ${HUBZILLA_DOMAIN_NAME}
504
-        echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
505
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
501
         echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
506
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
502
         echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
507
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
503
         echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-kanboard View File

504
         echo '  location ~ /\.(ht|git) {' >> $kanboard_nginx_site
504
         echo '  location ~ /\.(ht|git) {' >> $kanboard_nginx_site
505
         echo '    deny all;' >> $kanboard_nginx_site
505
         echo '    deny all;' >> $kanboard_nginx_site
506
         echo '  }' >> $kanboard_nginx_site
506
         echo '  }' >> $kanboard_nginx_site
507
-        echo '' >> $kanboard_nginx_site
508
-        # DO NOT ENABLE KEYBASE. kanboard really doesn't like having a .well-known directory
509
         echo '}' >> $kanboard_nginx_site
507
         echo '}' >> $kanboard_nginx_site
510
     else
508
     else
511
         echo -n '' > $kanboard_nginx_site
509
         echo -n '' > $kanboard_nginx_site
553
     echo '  location ~ /\.(ht|git) {' >> $kanboard_nginx_site
551
     echo '  location ~ /\.(ht|git) {' >> $kanboard_nginx_site
554
     echo '    deny all;' >> $kanboard_nginx_site
552
     echo '    deny all;' >> $kanboard_nginx_site
555
     echo '  }' >> $kanboard_nginx_site
553
     echo '  }' >> $kanboard_nginx_site
556
-    echo '' >> $kanboard_nginx_site
557
-    # DO NOT ENABLE KEYBASE. kanboard really doesn't like having a .well-known directory
558
     echo '}' >> $kanboard_nginx_site
554
     echo '}' >> $kanboard_nginx_site
559
 
555
 
560
     function_check configure_php
556
     function_check configure_php

+ 0
- 4
src/freedombone-app-lychee View File

260
     nginx_limits $LYCHEE_DOMAIN_NAME
260
     nginx_limits $LYCHEE_DOMAIN_NAME
261
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
261
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
262
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
262
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
263
-    nginx_keybase ${LYCHEE_DOMAIN_NAME}
264
-    echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
265
     echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
263
     echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
266
     echo '    # or a unix socket' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
264
     echo '    # or a unix socket' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
267
     echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
265
     echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
323
     nginx_limits $LYCHEE_DOMAIN_NAME
321
     nginx_limits $LYCHEE_DOMAIN_NAME
324
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
322
     echo '    }' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
325
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
323
     echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
326
-    nginx_keybase ${LYCHEE_DOMAIN_NAME}
327
-    echo '' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
328
     echo '    # block these file types' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
324
     echo '    # block these file types' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
329
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
325
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
330
     echo '        deny all;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
326
     echo '        deny all;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-mailpile View File

271
         echo "    proxy_pass http://localhost:${MAILPILE_PORT};" >> $mailpile_nginx_site
271
         echo "    proxy_pass http://localhost:${MAILPILE_PORT};" >> $mailpile_nginx_site
272
         echo '    proxy_redirect off;' >> $mailpile_nginx_site
272
         echo '    proxy_redirect off;' >> $mailpile_nginx_site
273
         echo '  }' >> $mailpile_nginx_site
273
         echo '  }' >> $mailpile_nginx_site
274
-        echo '' >> $mailpile_nginx_site
275
-        nginx_keybase ${MAILPILE_DOMAIN_NAME}
276
         echo '}' >> $mailpile_nginx_site
274
         echo '}' >> $mailpile_nginx_site
277
         echo '' >> $mailpile_nginx_site
275
         echo '' >> $mailpile_nginx_site
278
     else
276
     else
303
     echo "    proxy_pass http://localhost:${MAILPILE_PORT};" >> $mailpile_nginx_site
301
     echo "    proxy_pass http://localhost:${MAILPILE_PORT};" >> $mailpile_nginx_site
304
     echo '    proxy_redirect off;' >> $mailpile_nginx_site
302
     echo '    proxy_redirect off;' >> $mailpile_nginx_site
305
     echo '  }' >> $mailpile_nginx_site
303
     echo '  }' >> $mailpile_nginx_site
306
-    echo '' >> $mailpile_nginx_site
307
-    nginx_keybase ${MAILPILE_DOMAIN_NAME}
308
     echo '}' >> $mailpile_nginx_site
304
     echo '}' >> $mailpile_nginx_site
309
 
305
 
310
     function_check create_site_certificate
306
     function_check create_site_certificate

+ 0
- 1
src/freedombone-app-mediagoblin View File

381
         nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
381
         nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
382
         function_check nginx_limits
382
         function_check nginx_limits
383
         nginx_limits $MEDIAGOBLIN_DOMAIN_NAME 800m
383
         nginx_limits $MEDIAGOBLIN_DOMAIN_NAME 800m
384
-        nginx_keybase $MEDIAGOBLIN_DOMAIN_NAME
385
         echo '' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
384
         echo '' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
386
         echo '    client_header_timeout 10m;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
385
         echo '    client_header_timeout 10m;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
387
         echo '    client_body_timeout 10m;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
386
         echo '    client_body_timeout 10m;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME

+ 0
- 3
src/freedombone-app-nextcloud View File

545
         echo '  }' >> $nextcloud_nginx_site
545
         echo '  }' >> $nextcloud_nginx_site
546
         echo '' >> $nextcloud_nginx_site
546
         echo '' >> $nextcloud_nginx_site
547
         echo '  location /.well-known/acme-challenge { }' >> $nextcloud_nginx_site
547
         echo '  location /.well-known/acme-challenge { }' >> $nextcloud_nginx_site
548
-        echo '' >> $nextcloud_nginx_site
549
-
550
-        # DO NOT ENABLE KEYBASE. nextcloud really doesn't like having a .well-known directory
551
         echo '}' >> $nextcloud_nginx_site
548
         echo '}' >> $nextcloud_nginx_site
552
     else
549
     else
553
         echo -n '' > $nextcloud_nginx_site
550
         echo -n '' > $nextcloud_nginx_site

+ 0
- 4
src/freedombone-app-pelican View File

93
     nginx_limits $PELICAN_DOMAIN_NAME
93
     nginx_limits $PELICAN_DOMAIN_NAME
94
     echo '    }' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
94
     echo '    }' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
95
     echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
95
     echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
96
-    nginx_keybase ${PELICAN_DOMAIN_NAME}
97
-    echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
98
     echo '    # block these file types' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
96
     echo '    # block these file types' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
99
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
97
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
100
     echo '        deny all;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
98
     echo '        deny all;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
136
     nginx_limits $PELICAN_DOMAIN_NAME
134
     nginx_limits $PELICAN_DOMAIN_NAME
137
     echo '    }' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
135
     echo '    }' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
138
     echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
136
     echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
139
-    nginx_keybase ${PELICAN_DOMAIN_NAME}
140
-    echo '' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
141
     echo '    # block these file types' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
137
     echo '    # block these file types' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
142
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
138
     echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
143
     echo '        deny all;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
139
     echo '        deny all;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME

+ 0
- 4
src/freedombone-app-postactiv View File

753
         echo '  location ~ /\.(ht|git) {' >> $postactiv_nginx_site
753
         echo '  location ~ /\.(ht|git) {' >> $postactiv_nginx_site
754
         echo '    deny all;' >> $postactiv_nginx_site
754
         echo '    deny all;' >> $postactiv_nginx_site
755
         echo '  }' >> $postactiv_nginx_site
755
         echo '  }' >> $postactiv_nginx_site
756
-        echo '' >> $postactiv_nginx_site
757
-        # DO NOT ENABLE KEYBASE. postactiv really doesn't like having a .well-known directory
758
         echo '}' >> $postactiv_nginx_site
756
         echo '}' >> $postactiv_nginx_site
759
     else
757
     else
760
         echo -n '' > $postactiv_nginx_site
758
         echo -n '' > $postactiv_nginx_site
802
     echo '  location ~ /\.(ht|git) {' >> $postactiv_nginx_site
800
     echo '  location ~ /\.(ht|git) {' >> $postactiv_nginx_site
803
     echo '    deny all;' >> $postactiv_nginx_site
801
     echo '    deny all;' >> $postactiv_nginx_site
804
     echo '  }' >> $postactiv_nginx_site
802
     echo '  }' >> $postactiv_nginx_site
805
-    echo '' >> $postactiv_nginx_site
806
-    # DO NOT ENABLE KEYBASE. postactiv really doesn't like having a .well-known directory
807
     echo '}' >> $postactiv_nginx_site
803
     echo '}' >> $postactiv_nginx_site
808
 
804
 
809
     function_check configure_php
805
     function_check configure_php

+ 0
- 4
src/freedombone-app-riot View File

297
         function_check nginx_limits
297
         function_check nginx_limits
298
         nginx_limits $RIOT_DOMAIN_NAME '15m'
298
         nginx_limits $RIOT_DOMAIN_NAME '15m'
299
         echo '  }' >> $riot_nginx_site
299
         echo '  }' >> $riot_nginx_site
300
-        echo '' >> $riot_nginx_site
301
-        nginx_keybase ${RIOT_DOMAIN_NAME}
302
         echo '}' >> $riot_nginx_site
300
         echo '}' >> $riot_nginx_site
303
         echo '' >> $riot_nginx_site
301
         echo '' >> $riot_nginx_site
304
     else
302
     else
324
     function_check nginx_limits
322
     function_check nginx_limits
325
     nginx_limits $RIOT_DOMAIN_NAME '15m'
323
     nginx_limits $RIOT_DOMAIN_NAME '15m'
326
     echo '  }' >> $riot_nginx_site
324
     echo '  }' >> $riot_nginx_site
327
-    echo '' >> $riot_nginx_site
328
-    nginx_keybase ${RIOT_DOMAIN_NAME}
329
     echo '}' >> $riot_nginx_site
325
     echo '}' >> $riot_nginx_site
330
 
326
 
331
     sed '/Content-Security-Policy/d' $riot_nginx_site
327
     sed '/Content-Security-Policy/d' $riot_nginx_site

+ 0
- 4
src/freedombone-app-wekan View File

313
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
313
         echo '        log_not_found off;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
314
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
314
         echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
315
         echo '    }' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
315
         echo '    }' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
316
-        echo '' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
317
-        nginx_keybase ${WEKAN_DOMAIN_NAME}
318
         echo '}' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
316
         echo '}' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
319
         echo '' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
317
         echo '' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
320
     else
318
     else
347
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
345
     echo '        log_not_found off;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
348
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
346
     echo '        access_log /dev/null;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
349
     echo '    }' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
347
     echo '    }' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
350
-    echo '' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
351
-    nginx_keybase ${WEKAN_DOMAIN_NAME}
352
     echo '}' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
348
     echo '}' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
353
 
349
 
354
     function_check nginx_ensite
350
     function_check nginx_ensite

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

166
     #nginx_stapling $1
166
     #nginx_stapling $1
167
 }
167
 }
168
 
168
 
169
-function nginx_keybase {
170
-    # creates files suitable for keybase.io verification
171
-    domain_name=$1
172
-    filename=/etc/nginx/sites-available/$domain_name
173
-
174
-    echo '' >> $filename
175
-    echo "  # make sure webfinger and other well known services aren't blocked" >> $filename
176
-    echo '  # by denying dot files and rewrite request to the front controller' >> $filename
177
-    echo '  location ^~ /.well-known/ {' >> $filename
178
-    echo '      allow all;' >> $filename
179
-    echo '  }' >> $filename
180
-
181
-    if [ ! -d /var/www/${domain_name}/htdocs/.well-known ]; then
182
-        mkdir -p /var/www/${domain_name}/htdocs/.well-known
183
-    fi
184
-    if [ ! -f /var/www/${domain_name}/htdocs/keybase.txt ]; then
185
-        touch /var/www/${domain_name}/htdocs/keybase.txt
186
-    fi
187
-    if [ ! -f /var/www/${domain_name}/htdocs/.well-known/keybase.txt ]; then
188
-        touch /var/www/${domain_name}/htdocs/.well-known/keybase.txt
189
-    fi
190
-}
191
-
192
 # check an individual domain name
169
 # check an individual domain name
193
 function test_domain_name {
170
 function test_domain_name {
194
     if [ $1 ]; then
171
     if [ $1 ]; then