Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-akaunting

         nginx_http_redirect $AKAUNTING_DOMAIN_NAME "index index.php"
         echo 'server {' >> $akaunting_nginx_site
         echo '  listen 443 ssl;' >> $akaunting_nginx_site
-        echo '  listen [::]:443 ssl;' >> $akaunting_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $akaunting_nginx_site
         echo "  server_name $AKAUNTING_DOMAIN_NAME;" >> $akaunting_nginx_site
         echo '' >> $akaunting_nginx_site
         function_check nginx_compress

src/freedombone-app-dokuwiki

         nginx_http_redirect $DOKUWIKI_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
         echo "    root /var/www/$DOKUWIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
         echo "    server_name $DOKUWIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME

src/freedombone-app-edith

         nginx_http_redirect $EDITH_DOMAIN_NAME "index index.php"
         echo 'server {' >> $edith_nginx_site
         echo '  listen 443 ssl;' >> $edith_nginx_site
-        echo '  listen [::]:443 ssl;' >> $edith_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $edith_nginx_site
         echo "  server_name $EDITH_DOMAIN_NAME;" >> $edith_nginx_site
         echo '' >> $edith_nginx_site
         function_check nginx_compress

src/freedombone-app-etherpad

         nginx_http_redirect $ETHERPAD_DOMAIN_NAME
         echo 'server {' >> $etherpad_nginx_site
         echo '  listen 443 ssl;' >> $etherpad_nginx_site
-        echo '  listen [::]:443 ssl;' >> $etherpad_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $etherpad_nginx_site
         echo "  server_name $ETHERPAD_DOMAIN_NAME;" >> $etherpad_nginx_site
         echo '' >> $etherpad_nginx_site
         echo '  # Security' >> $etherpad_nginx_site

src/freedombone-app-fedwiki

         echo '' >> $fedwiki_nginx_file
         echo 'server {' >> $fedwiki_nginx_file
         echo '  listen 443 ssl;' >> $fedwiki_nginx_file
-        echo '  listen [::]:443 ssl;' >> $fedwiki_nginx_file
+        echo '  #listen [::]:443 ssl;' >> $fedwiki_nginx_file
         echo "  server_name $FEDWIKI_DOMAIN_NAME;" >> $fedwiki_nginx_file
         echo '' >> $fedwiki_nginx_file
         function_check nginx_ssl

src/freedombone-app-friendica

         nginx_http_redirect $FRIENDICA_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
         echo "    root $FRIENDICA_PATH;" >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
         echo "    server_name $FRIENDICA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
         echo "    error_log /dev/null;" >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME

src/freedombone-app-ghost

         nginx_http_redirect ${GHOST_DOMAIN_NAME}
         echo 'server {' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
         echo "    root /var/www/${GHOST_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
         echo "    server_name ${GHOST_DOMAIN_NAME};" >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${GHOST_DOMAIN_NAME}

src/freedombone-app-gnusocial

         nginx_http_redirect $GNUSOCIAL_DOMAIN_NAME "index index.php"
         echo 'server {' >> $gnusocial_nginx_site
         echo '  listen 443 ssl;' >> $gnusocial_nginx_site
-        echo '  listen [::]:443 ssl;' >> $gnusocial_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $gnusocial_nginx_site
         echo "  server_name $GNUSOCIAL_DOMAIN_NAME;" >> $gnusocial_nginx_site
         echo '' >> $gnusocial_nginx_site
         function_check nginx_compress

src/freedombone-app-gogs

         nginx_http_redirect ${GIT_DOMAIN_NAME}
         echo 'server {' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
         echo "    root /var/www/${GIT_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
         echo "    server_name ${GIT_DOMAIN_NAME};" >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${GIT_DOMAIN_NAME}

src/freedombone-app-htmly

     nginx_http_redirect $HTMLY_DOMAIN_NAME
     echo 'server {' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
     echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
-    echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
+    echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
     echo "    root /var/www/$HTMLY_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
     echo "    server_name $HTMLY_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
     echo '    access_log /dev/null;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME

src/freedombone-app-hubzilla

         nginx_http_redirect $HUBZILLA_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo "    root $HUBZILLA_PATH;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo "    server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
         echo "    error_log /dev/null;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME

src/freedombone-app-jitsi

         echo '}' >> $jitsi_nginx_site
         echo 'server {' >> $jitsi_nginx_site
         echo '    listen 443 ssl;' >> $jitsi_nginx_site
-        echo '    listen [::]:443 ssl;' >> $jitsi_nginx_site
+        echo '    #listen [::]:443 ssl;' >> $jitsi_nginx_site
         echo "    server_name ${JITSI_DOMAIN_NAME};" >> $jitsi_nginx_site
         echo '' >> $jitsi_nginx_site
 

src/freedombone-app-kanboard

         nginx_http_redirect $KANBOARD_DOMAIN_NAME "index index.php"
         echo 'server {' >> $kanboard_nginx_site
         echo '  listen 443 ssl;' >> $kanboard_nginx_site
-        echo '  listen [::]:443 ssl;' >> $kanboard_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $kanboard_nginx_site
         echo "  server_name $KANBOARD_DOMAIN_NAME;" >> $kanboard_nginx_site
         echo '' >> $kanboard_nginx_site
         function_check nginx_compress

src/freedombone-app-keyserver

         echo 'server {' >> $keyserver_nginx_site
         echo '  listen 443 ssl;' >> $keyserver_nginx_site
         echo '  listen 0.0.0.0:11372 ssl;' >> $keyserver_nginx_site
-        echo '  listen [::]:443 ssl;' >> $keyserver_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $keyserver_nginx_site
         echo "  server_name $KEYSERVER_DOMAIN_NAME;" >> $keyserver_nginx_site
         echo '' >> $keyserver_nginx_site
         echo '  error_page 404 /404.html;' >> $keyserver_nginx_site

src/freedombone-app-koel

         nginx_http_redirect $KOEL_DOMAIN_NAME "index index.php"
         echo 'server {' >> $koel_nginx_site
         echo '  listen 443 ssl;' >> $koel_nginx_site
-        echo '  listen [::]:443 ssl;' >> $koel_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $koel_nginx_site
         echo "  server_name $KOEL_DOMAIN_NAME;" >> $koel_nginx_site
         echo '' >> $koel_nginx_site
         function_check nginx_compress

src/freedombone-app-lychee

     nginx_http_redirect $LYCHEE_DOMAIN_NAME
     echo 'server {' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
     echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
-    echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
+    echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
     echo "    root /var/www/$LYCHEE_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
     echo "    server_name $LYCHEE_DOMAIN_NAME;" >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
     echo '    access_log /dev/null;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME

src/freedombone-app-mailpile

         nginx_http_redirect $MAILPILE_DOMAIN_NAME
         echo 'server {' >> $mailpile_nginx_site
         echo '  listen 443 ssl;' >> $mailpile_nginx_site
-        echo '  listen [::]:443 ssl;' >> $mailpile_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $mailpile_nginx_site
         echo "  server_name $MAILPILE_DOMAIN_NAME;" >> $mailpile_nginx_site
         echo '' >> $mailpile_nginx_site
         echo '  # Security' >> $mailpile_nginx_site

src/freedombone-app-mediagoblin

         nginx_http_redirect $MEDIAGOBLIN_DOMAIN_NAME
         echo 'server {' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
         echo '    include /etc/nginx/mime.types;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
         echo '' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
         echo '    autoindex off;' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME

src/freedombone-app-movim

         nginx_http_redirect $MOVIM_DOMAIN_NAME "index index.php"
         echo 'server {' >> $movim_nginx_site
         echo '  listen 443 ssl;' >> $movim_nginx_site
-        echo '  listen [::]:443 ssl;' >> $movim_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $movim_nginx_site
         echo "  server_name $MOVIM_DOMAIN_NAME;" >> $movim_nginx_site
         echo '' >> $movim_nginx_site
         function_check nginx_compress

src/freedombone-app-nextcloud

         nginx_http_redirect $NEXTCLOUD_DOMAIN_NAME
         echo 'server {' >> $nextcloud_nginx_site
         echo '  listen 443 ssl;' >> $nextcloud_nginx_site
-        echo '  listen [::]:443 ssl;' >> $nextcloud_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $nextcloud_nginx_site
         echo "  server_name $NEXTCLOUD_DOMAIN_NAME;" >> $nextcloud_nginx_site
         echo '' >> $nextcloud_nginx_site
         echo '  # Security' >> $nextcloud_nginx_site

src/freedombone-app-peertube

         echo '' >> $peertube_nginx_file
         echo 'server {' >> $peertube_nginx_file
         echo '  listen 443 ssl http2;' >> $peertube_nginx_file
-        echo '  listen [::]:443 ssl http2;' >> $peertube_nginx_file
+        echo '  #listen [::]:443 ssl http2;' >> $peertube_nginx_file
         echo "  server_name $PEERTUBE_DOMAIN_NAME;" >> $peertube_nginx_file
         echo '' >> $peertube_nginx_file
         function_check nginx_ssl

src/freedombone-app-pelican

     nginx_http_redirect $PELICAN_DOMAIN_NAME
     echo 'server {' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
     echo '    listen 443 ssl;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
-    echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
+    echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
     echo "    root /var/www/${PELICAN_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
     echo "    server_name ${PELICAN_DOMAIN_NAME};" >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME
     echo '    access_log /dev/null;' >> /etc/nginx/sites-available/$PELICAN_DOMAIN_NAME

src/freedombone-app-pleroma

         echo '' >> $pleroma_nginx_site
         echo 'server {' >> $pleroma_nginx_site
         echo '  listen 443 ssl;' >> $pleroma_nginx_site
-        echo '  listen [::]:443 ssl;' >> $pleroma_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $pleroma_nginx_site
         echo "  server_name $PLEROMA_DOMAIN_NAME;" >> $pleroma_nginx_site
         echo '' >> $pleroma_nginx_site
         function_check nginx_compress

src/freedombone-app-postactiv

         nginx_http_redirect $POSTACTIV_DOMAIN_NAME "index index.php"
         echo 'server {' >> $postactiv_nginx_site
         echo '  listen 443 ssl;' >> $postactiv_nginx_site
-        echo '  listen [::]:443 ssl;' >> $postactiv_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $postactiv_nginx_site
         echo "  server_name $POSTACTIV_DOMAIN_NAME;" >> $postactiv_nginx_site
         echo '' >> $postactiv_nginx_site
         function_check nginx_compress

src/freedombone-app-privatebin

         nginx_http_redirect $PRIVATEBIN_DOMAIN_NAME "index index.php"
         echo 'server {' >> $privatebin_nginx_site
         echo '  listen 443 ssl;' >> $privatebin_nginx_site
-        echo '  listen [::]:443 ssl;' >> $privatebin_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $privatebin_nginx_site
         echo "  server_name $PRIVATEBIN_DOMAIN_NAME;" >> $privatebin_nginx_site
         echo '' >> $privatebin_nginx_site
         function_check nginx_compress

src/freedombone-app-radicale

         if [[ $ONION_ONLY == 'no' ]]; then
             echo 'server {' > /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
             echo "    listen 443 ssl;" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
-            echo "    listen [::]:443 ssl;" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
+            echo "    #listen [::]:443 ssl;" >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
             echo '' >> /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}
             function_check nginx_ssl
             nginx_ssl ${DEFAULT_DOMAIN_NAME} mobile

src/freedombone-app-riot

         nginx_http_redirect $RIOT_DOMAIN_NAME
         echo 'server {' >> $riot_nginx_site
         echo '  listen 443 ssl;' >> $riot_nginx_site
-        echo '  listen [::]:443 ssl;' >> $riot_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $riot_nginx_site
         echo "  server_name $RIOT_DOMAIN_NAME;" >> $riot_nginx_site
         echo '' >> $riot_nginx_site
         echo '  # Security' >> $riot_nginx_site

src/freedombone-app-scuttlebot

         nginx_http_redirect $SCUTTLEBOT_DOMAIN_NAME "index index.html"
         echo 'server {' >> $git_ssb_nginx_site
         echo '  listen 443 ssl;' >> $git_ssb_nginx_site
-        echo '  listen [::]:443 ssl;' >> $git_ssb_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $git_ssb_nginx_site
         echo "  server_name $SCUTTLEBOT_DOMAIN_NAME;" >> $git_ssb_nginx_site
         echo '' >> $git_ssb_nginx_site
         function_check nginx_compress

src/freedombone-app-turtl

         nginx_http_redirect $TURTL_DOMAIN_NAME
         echo 'server {' >> $turtl_nginx_site
         echo '  listen 443 ssl;' >> $turtl_nginx_site
-        echo '  listen [::]:443 ssl;' >> $turtl_nginx_site
+        echo '  #listen [::]:443 ssl;' >> $turtl_nginx_site
         echo "  server_name ${TURTL_DOMAIN_NAME};" >> $turtl_nginx_site
         echo '' >> $turtl_nginx_site
         echo '  # Security' >> $turtl_nginx_site

src/freedombone-app-wekan

         nginx_http_redirect ${WEKAN_DOMAIN_NAME}
         echo 'server {' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
         echo '    listen 443 ssl;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
-        echo '    listen [::]:443 ssl;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
+        echo '    #listen [::]:443 ssl;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
         echo "    root /var/www/${WEKAN_DOMAIN_NAME}/htdocs;" >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
         echo "    server_name ${WEKAN_DOMAIN_NAME};" >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}
         echo '    access_log /dev/null;' >> /etc/nginx/sites-available/${WEKAN_DOMAIN_NAME}

src/freedombone-template

     fi
     echo "        echo 'server {' >> \$${app_name}_nginx_site"
     echo "        echo '  listen 443 ssl;' >> \$${app_name}_nginx_site"
-    echo "        echo '  listen [::]:443 ssl;' >> \$${app_name}_nginx_site"
+    echo "        echo '  #listen [::]:443 ssl;' >> \$${app_name}_nginx_site"
     echo "        echo \"  server_name \$${app_name_upper}_DOMAIN_NAME;\" >> \$${app_name}_nginx_site"
     echo "        echo '' >> \$${app_name}_nginx_site"
     echo "        nginx_compress \$${app_name_upper}_DOMAIN_NAME"

src/freedombone-utils-web

             nginx_http_redirect $DEFAULT_DOMAIN_NAME
             echo 'server {' >> $nginx_site
             echo '  listen 443 ssl;' >> $nginx_site
-            echo '  listen [::]:443 ssl;' >> $nginx_site
+            echo '  #listen [::]:443 ssl;' >> $nginx_site
             echo "  server_name $DEFAULT_DOMAIN_NAME;" >> $nginx_site
             echo '' >> $nginx_site
             echo '  # Security' >> $nginx_site