free
/
freedombone
Suivre 1
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Tidying

Bob Mottram il y a 9 ans
Parent
656cedeb75
révision
efd1433b15
1 fichiers modifiés avec 101 ajouts et 100 suppressions
Vue séparée Afficher les stats Diff
  1. 101
    100
      src/freedombone

+ 101
- 100
src/freedombone Voir le fichier 

@@ -8620,108 +8620,109 @@ function install_gnu_social {
8620 8620 
     CURRENT_DDNS_DOMAIN=$MICROBLOG_DOMAIN_NAME
8621 8621 
     add_ddns_domain
8622 8622
8623 
+	microblog_nginx_site=/etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8623 8624 
     if [[ $ONION_ONLY == "no" ]]; then
8624 
-        echo 'server {' > /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8625 
-        echo '  listen 80;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8626 
-        echo '  listen [::]:80;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8627 
-        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8628 
-        echo '  rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8629 
-        echo '}' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8630 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8631 
-        echo 'server {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8632 
-        echo '  listen 443 ssl;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8633 
-        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8634 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8635 
-        echo '  # Security' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8636 
-        echo '  ssl on;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8637 
-        echo "  ssl_certificate /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.pem;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8638 
-        echo "  ssl_certificate_key /etc/ssl/private/$MICROBLOG_DOMAIN_NAME.key;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8639 
-        echo "  ssl_dhparam /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8640 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8641 
-        echo '  ssl_session_timeout 60m;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8642 
-        echo '  ssl_prefer_server_ciphers on;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8643 
-        echo '  ssl_session_cache  builtin:1000  shared:SSL:10m;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8644 
-        echo "  ssl_protocols $SSL_PROTOCOLS; # not possible to do exclusive" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8645 
-        echo "  ssl_ciphers '$SSL_CIPHERS';" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8646 
-        echo '  add_header X-Frame-Options DENY;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8647 
-        echo '  add_header X-Content-Type-Options nosniff;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8648 
-        echo '  add_header Strict-Transport-Security max-age=15768000;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8649 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8650 
-        echo '  # Logs' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8651 
-        echo '  access_log off;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8652 
-        echo '  error_log off;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8653 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8654 
-        echo '  # Root' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8655 
-        echo "  root /var/www/$MICROBLOG_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8656 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8657 
-        echo '  # Index' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8658 
-        echo '  index index.php;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8659 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8660 
-        echo '  # PHP' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8661 
-        echo '  location ~ \.php {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8662 
-        echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8663 
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8664 
-        echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8665 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8666 
-        echo '  # Location' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8667 
-        echo '  location / {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8668 
-        echo '    try_files $uri $uri/ @gnusocial;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8669 
-        echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8670 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8671 
-        echo '  # Fancy URLs' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8672 
-        echo '  location @gnusocial {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8673 
-        echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8674 
-        echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8675 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8676 
-        echo '  # Restrict access that is unnecessary anyway' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8677 
-        echo '  location ~ /\.(ht|git) {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8678 
-        echo '    deny all;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8679 
-        echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8680 
-        echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8681 
-        echo '  client_max_body_size 15m;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8682 
-        echo '}' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8625 
+        echo 'server {' > $microblog_nginx_site
8626 
+        echo '  listen 80;' >> $microblog_nginx_site
8627 
+        echo '  listen [::]:80;' >> $microblog_nginx_site
8628 
+        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
8629 
+        echo '  rewrite ^ https://$server_name$request_uri? permanent;' >> $microblog_nginx_site
8630 
+        echo '}' >> $microblog_nginx_site
8631 
+        echo '' >> $microblog_nginx_site
8632 
+        echo 'server {' >> $microblog_nginx_site
8633 
+        echo '  listen 443 ssl;' >> $microblog_nginx_site
8634 
+        echo "  server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
8635 
+        echo '' >> $microblog_nginx_site
8636 
+        echo '  # Security' >> $microblog_nginx_site
8637 
+        echo '  ssl on;' >> $microblog_nginx_site
8638 
+        echo "  ssl_certificate /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.pem;" >> $microblog_nginx_site
8639 
+        echo "  ssl_certificate_key /etc/ssl/private/$MICROBLOG_DOMAIN_NAME.key;" >> $microblog_nginx_site
8640 
+        echo "  ssl_dhparam /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam;" >> $microblog_nginx_site
8641 
+        echo '' >> $microblog_nginx_site
8642 
+        echo '  ssl_session_timeout 60m;' >> $microblog_nginx_site
8643 
+        echo '  ssl_prefer_server_ciphers on;' >> $microblog_nginx_site
8644 
+        echo '  ssl_session_cache  builtin:1000  shared:SSL:10m;' >> $microblog_nginx_site
8645 
+        echo "  ssl_protocols $SSL_PROTOCOLS; # not possible to do exclusive" >> $microblog_nginx_site
8646 
+        echo "  ssl_ciphers '$SSL_CIPHERS';" >> $microblog_nginx_site
8647 
+        echo '  add_header X-Frame-Options DENY;' >> $microblog_nginx_site
8648 
+        echo '  add_header X-Content-Type-Options nosniff;' >> $microblog_nginx_site
8649 
+        echo '  add_header Strict-Transport-Security max-age=15768000;' >> $microblog_nginx_site
8650 
+        echo '' >> $microblog_nginx_site
8651 
+        echo '  # Logs' >> $microblog_nginx_site
8652 
+        echo '  access_log off;' >> $microblog_nginx_site
8653 
+        echo '  error_log off;' >> $microblog_nginx_site
8654 
+        echo '' >> $microblog_nginx_site
8655 
+        echo '  # Root' >> $microblog_nginx_site
8656 
+        echo "  root /var/www/$MICROBLOG_DOMAIN_NAME/htdocs;" >> $microblog_nginx_site
8657 
+        echo '' >> $microblog_nginx_site
8658 
+        echo '  # Index' >> $microblog_nginx_site
8659 
+        echo '  index index.php;' >> $microblog_nginx_site
8660 
+        echo '' >> $microblog_nginx_site
8661 
+        echo '  # PHP' >> $microblog_nginx_site
8662 
+        echo '  location ~ \.php {' >> $microblog_nginx_site
8663 
+        echo '    include snippets/fastcgi-php.conf;' >> $microblog_nginx_site
8664 
+        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $microblog_nginx_site
8665 
+        echo '  }' >> $microblog_nginx_site
8666 
+        echo '' >> $microblog_nginx_site
8667 
+        echo '  # Location' >> $microblog_nginx_site
8668 
+        echo '  location / {' >> $microblog_nginx_site
8669 
+        echo '    try_files $uri $uri/ @gnusocial;' >> $microblog_nginx_site
8670 
+        echo '  }' >> $microblog_nginx_site
8671 
+        echo '' >> $microblog_nginx_site
8672 
+        echo '  # Fancy URLs' >> $microblog_nginx_site
8673 
+        echo '  location @gnusocial {' >> $microblog_nginx_site
8674 
+        echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> $microblog_nginx_site
8675 
+        echo '  }' >> $microblog_nginx_site
8676 
+        echo '' >> $microblog_nginx_site
8677 
+        echo '  # Restrict access that is unnecessary anyway' >> $microblog_nginx_site
8678 
+        echo '  location ~ /\.(ht|git) {' >> $microblog_nginx_site
8679 
+        echo '    deny all;' >> $microblog_nginx_site
8680 
+        echo '  }' >> $microblog_nginx_site
8681 
+        echo '' >> $microblog_nginx_site
8682 
+        echo '  client_max_body_size 15m;' >> $microblog_nginx_site
8683 
+        echo '}' >> $microblog_nginx_site
8683 8684 
     else
8684 
-        echo -n '' > /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8685 
-    fi
8686 
-    echo 'server {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8687 
-    echo "    listen 127.0.0.1:$MICROBLOG_ONION_PORT default_server;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8688 
-    echo "    server_name $MICROBLOG_DOMAIN_NAME;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8689 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8690 
-    echo '  # Logs' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8691 
-    echo '  access_log off;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8692 
-    echo '  error_log off;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8693 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8694 
-    echo '  # Root' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8695 
-    echo "  root /var/www/$MICROBLOG_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8696 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8697 
-    echo '  # Index' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8698 
-    echo '  index index.php;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8699 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8700 
-    echo '  # PHP' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8701 
-    echo '  location ~ \.php {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8702 
-    echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8703 
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8704 
-    echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8705 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8706 
-    echo '  # Location' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8707 
-    echo '  location / {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8708 
-    echo '    try_files $uri $uri/ @gnusocial;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8709 
-    echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8710 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8711 
-    echo '  # Fancy URLs' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8712 
-    echo '  location @gnusocial {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8713 
-    echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8714 
-    echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8715 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8716 
-    echo '  # Restrict access that is unnecessary anyway' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8717 
-    echo '  location ~ /\.(ht|git) {' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8718 
-    echo '    deny all;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8719 
-    echo '  }' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8720 
-    echo '' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8721 
-    echo '  add_header X-Frame-Options DENY;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8722 
-    echo '  add_header X-Content-Type-Options nosniff;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8723 
-    echo '  client_max_body_size 15m;' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8724 
-    echo '}' >> /etc/nginx/sites-available/$MICROBLOG_DOMAIN_NAME
8685 
+        echo -n '' > $microblog_nginx_site
8686 
+    fi
8687 
+    echo 'server {' >> $microblog_nginx_site
8688 
+    echo "    listen 127.0.0.1:$MICROBLOG_ONION_PORT default_server;" >> $microblog_nginx_site
8689 
+    echo "    server_name $MICROBLOG_DOMAIN_NAME;" >> $microblog_nginx_site
8690 
+    echo '' >> $microblog_nginx_site
8691 
+    echo '  # Logs' >> $microblog_nginx_site
8692 
+    echo '  access_log off;' >> $microblog_nginx_site
8693 
+    echo '  error_log off;' >> $microblog_nginx_site
8694 
+    echo '' >> $microblog_nginx_site
8695 
+    echo '  # Root' >> $microblog_nginx_site
8696 
+    echo "  root /var/www/$MICROBLOG_DOMAIN_NAME/htdocs;" >> $microblog_nginx_site
8697 
+    echo '' >> $microblog_nginx_site
8698 
+    echo '  # Index' >> $microblog_nginx_site
8699 
+    echo '  index index.php;' >> $microblog_nginx_site
8700 
+    echo '' >> $microblog_nginx_site
8701 
+    echo '  # PHP' >> $microblog_nginx_site
8702 
+    echo '  location ~ \.php {' >> $microblog_nginx_site
8703 
+    echo '    include snippets/fastcgi-php.conf;' >> $microblog_nginx_site
8704 
+    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $microblog_nginx_site
8705 
+    echo '  }' >> $microblog_nginx_site
8706 
+    echo '' >> $microblog_nginx_site
8707 
+    echo '  # Location' >> $microblog_nginx_site
8708 
+    echo '  location / {' >> $microblog_nginx_site
8709 
+    echo '    try_files $uri $uri/ @gnusocial;' >> $microblog_nginx_site
8710 
+    echo '  }' >> $microblog_nginx_site
8711 
+    echo '' >> $microblog_nginx_site
8712 
+    echo '  # Fancy URLs' >> $microblog_nginx_site
8713 
+    echo '  location @gnusocial {' >> $microblog_nginx_site
8714 
+    echo '    rewrite ^(.*)$ /index.php?p=$1 last;' >> $microblog_nginx_site
8715 
+    echo '  }' >> $microblog_nginx_site
8716 
+    echo '' >> $microblog_nginx_site
8717 
+    echo '  # Restrict access that is unnecessary anyway' >> $microblog_nginx_site
8718 
+    echo '  location ~ /\.(ht|git) {' >> $microblog_nginx_site
8719 
+    echo '    deny all;' >> $microblog_nginx_site
8720 
+    echo '  }' >> $microblog_nginx_site
8721 
+    echo '' >> $microblog_nginx_site
8722 
+    echo '  add_header X-Frame-Options DENY;' >> $microblog_nginx_site
8723 
+    echo '  add_header X-Content-Type-Options nosniff;' >> $microblog_nginx_site
8724 
+    echo '  client_max_body_size 15m;' >> $microblog_nginx_site
8725 
+    echo '}' >> $microblog_nginx_site
8725 8726
8726 8727 
     configure_php
8727 8728