소스 검색

Update php to version 7.0

Bob Mottram 8 년 전
부모
커밋
92edd5dc1f

+ 7
- 7
src/freedombone-app-dokuwiki 파일 보기

379
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
379
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
380
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
380
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
381
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
381
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
382
-        echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
382
+        echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
383
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
383
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
384
-        echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
385
-        echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
384
+        echo '        # With php-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
385
+        echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
386
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
386
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
387
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
387
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
388
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
388
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
457
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
457
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
458
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
458
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
459
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
459
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
460
-    echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
460
+    echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
461
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
461
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
462
-    echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
463
-    echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
462
+    echo '        # With php-fpm:' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
463
+    echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
464
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
464
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
465
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
465
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
466
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
466
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$DOKUWIKI_DOMAIN_NAME
491
 
491
 
492
     nginx_ensite $DOKUWIKI_DOMAIN_NAME
492
     nginx_ensite $DOKUWIKI_DOMAIN_NAME
493
 
493
 
494
-    systemctl restart php5-fpm
494
+    systemctl restart php-fpm
495
     systemctl restart nginx
495
     systemctl restart nginx
496
 
496
 
497
     function_check add_ddns_domain
497
     function_check add_ddns_domain

+ 10
- 10
src/freedombone-app-friendica 파일 보기

327
     function_check repair_databases_script
327
     function_check repair_databases_script
328
     repair_databases_script
328
     repair_databases_script
329
 
329
 
330
-    apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
331
-    apt-get -yq install php5-dev imagemagick php5-imagick
332
-    apt-get -yq install php5-memcached
330
+    apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git
331
+    apt-get -yq install php-dev imagemagick php-imagick
332
+    apt-get -yq install php-memcached
333
 
333
 
334
     if [ ! -d /var/www/$FRIENDICA_DOMAIN_NAME ]; then
334
     if [ ! -d /var/www/$FRIENDICA_DOMAIN_NAME ]; then
335
         mkdir /var/www/$FRIENDICA_DOMAIN_NAME
335
         mkdir /var/www/$FRIENDICA_DOMAIN_NAME
425
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
425
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
426
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
426
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
427
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
427
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
428
-        echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
428
+        echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
429
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
429
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
430
-        echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
431
-        echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
430
+        echo '        # With php-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
431
+        echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
432
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
432
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
433
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
433
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
434
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
434
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
493
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
493
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
494
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
494
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
495
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
495
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
496
-        echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
496
+        echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
497
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
497
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
498
-        echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
499
-        echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
498
+        echo '        # With php-fpm:' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
499
+        echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
500
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
500
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
501
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
501
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
502
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
502
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$FRIENDICA_DOMAIN_NAME
588
     chown www-data:www-data $FRIENDICA_PATH/.htconfig.php
588
     chown www-data:www-data $FRIENDICA_PATH/.htconfig.php
589
     chmod 755 $FRIENDICA_PATH/.htconfig.php
589
     chmod 755 $FRIENDICA_PATH/.htconfig.php
590
 
590
 
591
-    systemctl restart php5-fpm
591
+    systemctl restart php-fpm
592
     systemctl restart nginx
592
     systemctl restart nginx
593
     systemctl restart cron
593
     systemctl restart cron
594
 
594
 

+ 5
- 5
src/freedombone-app-gnusocial 파일 보기

537
     function_check repair_databases_script
537
     function_check repair_databases_script
538
     repair_databases_script
538
     repair_databases_script
539
 
539
 
540
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
541
-    apt-get -yq install php5-memcached php5-intl exiftool
540
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
541
+    apt-get -yq install php-memcached php-intl exiftool
542
 
542
 
543
     if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
543
     if [ ! -d /var/www/$GNUSOCIAL_DOMAIN_NAME ]; then
544
         mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME
544
         mkdir /var/www/$GNUSOCIAL_DOMAIN_NAME
614
         echo '  # PHP' >> $gnusocial_nginx_site
614
         echo '  # PHP' >> $gnusocial_nginx_site
615
         echo '  location ~ \.php {' >> $gnusocial_nginx_site
615
         echo '  location ~ \.php {' >> $gnusocial_nginx_site
616
         echo '    include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site
616
         echo '    include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site
617
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $gnusocial_nginx_site
617
+        echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $gnusocial_nginx_site
618
         echo '  }' >> $gnusocial_nginx_site
618
         echo '  }' >> $gnusocial_nginx_site
619
         echo '' >> $gnusocial_nginx_site
619
         echo '' >> $gnusocial_nginx_site
620
         echo '  # Location' >> $gnusocial_nginx_site
620
         echo '  # Location' >> $gnusocial_nginx_site
662
     echo '  # PHP' >> $gnusocial_nginx_site
662
     echo '  # PHP' >> $gnusocial_nginx_site
663
     echo '  location ~ \.php {' >> $gnusocial_nginx_site
663
     echo '  location ~ \.php {' >> $gnusocial_nginx_site
664
     echo '    include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site
664
     echo '    include snippets/fastcgi-php.conf;' >> $gnusocial_nginx_site
665
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $gnusocial_nginx_site
665
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $gnusocial_nginx_site
666
     echo '  }' >> $gnusocial_nginx_site
666
     echo '  }' >> $gnusocial_nginx_site
667
     echo '' >> $gnusocial_nginx_site
667
     echo '' >> $gnusocial_nginx_site
668
     echo '  # Location' >> $gnusocial_nginx_site
668
     echo '  # Location' >> $gnusocial_nginx_site
770
     # This improves performance
770
     # This improves performance
771
     sed -i "s|//\$config\['db'\]\['schemacheck'\].*|\$config\['db'\]\['schemacheck'\] = 'script';|g" $gnusocial_config_file
771
     sed -i "s|//\$config\['db'\]\['schemacheck'\].*|\$config\['db'\]\['schemacheck'\] = 'script';|g" $gnusocial_config_file
772
 
772
 
773
-    systemctl restart php5-fpm
773
+    systemctl restart php-fpm
774
     systemctl restart nginx
774
     systemctl restart nginx
775
 
775
 
776
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$GNUSOCIAL_DOMAIN_NAME" -g gnusocial --public no
776
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$GNUSOCIAL_DOMAIN_NAME" -g gnusocial --public no

+ 1
- 1
src/freedombone-app-gogs 파일 보기

575
 
575
 
576
     GIT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_gogs/hostname)
576
     GIT_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_gogs/hostname)
577
 
577
 
578
-    systemctl restart php5-fpm
578
+    systemctl restart php-fpm
579
     systemctl restart nginx
579
     systemctl restart nginx
580
 
580
 
581
     set_completion_param "gogs domain" "$GIT_DOMAIN_NAME"
581
     set_completion_param "gogs domain" "$GIT_DOMAIN_NAME"

+ 7
- 7
src/freedombone-app-htmly 파일 보기

462
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
462
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
463
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
463
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
464
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
464
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
465
-    echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
465
+    echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
466
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
466
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
467
-    echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
468
-    echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
467
+    echo '        # With php-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
468
+    echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
469
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
469
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
470
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
470
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
471
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
471
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
541
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
541
     echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
542
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
542
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
543
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
543
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
544
-    echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
544
+    echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
545
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
545
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
546
-    echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
547
-    echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
546
+    echo '        # With php-fpm:' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
547
+    echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
548
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
548
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
549
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
549
     echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
550
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
550
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HTMLY_DOMAIN_NAME
627
     function_check nginx_ensite
627
     function_check nginx_ensite
628
     nginx_ensite $HTMLY_DOMAIN_NAME
628
     nginx_ensite $HTMLY_DOMAIN_NAME
629
 
629
 
630
-    systemctl restart php5-fpm
630
+    systemctl restart php-fpm
631
     systemctl restart nginx
631
     systemctl restart nginx
632
 
632
 
633
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a htmly -p "$HTMLY_ADMIN_PASSWORD"
633
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a htmly -p "$HTMLY_ADMIN_PASSWORD"

+ 10
- 10
src/freedombone-app-hubzilla 파일 보기

318
     function_check repair_databases_script
318
     function_check repair_databases_script
319
     repair_databases_script
319
     repair_databases_script
320
 
320
 
321
-    apt-get -yq install php5-common php5-cli php5-curl php5-gd php5-mysql php5-mcrypt git
322
-    apt-get -yq install php5-dev imagemagick php5-imagick
323
-    apt-get -yq install php5-memcached
321
+    apt-get -yq install php-common php-cli php-curl php-gd php-mysql php-mcrypt git
322
+    apt-get -yq install php-dev imagemagick php-imagick
323
+    apt-get -yq install php-memcached
324
 
324
 
325
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
325
     if [ ! -d /var/www/$HUBZILLA_DOMAIN_NAME ]; then
326
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME
326
         mkdir /var/www/$HUBZILLA_DOMAIN_NAME
420
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
420
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
421
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
421
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
422
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
422
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
423
-        echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
423
+        echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
424
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
424
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
425
-        echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
426
-        echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
425
+        echo '        # With php-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
426
+        echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
427
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
427
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
428
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
428
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
429
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
429
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
488
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
488
         echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
489
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
489
         echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
490
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
490
         echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
491
-        echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
491
+        echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
492
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
492
         echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
493
-        echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
494
-        echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
493
+        echo '        # With php-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
494
+        echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
495
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
495
         echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
496
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
496
         echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
497
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
497
         echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
583
     chown www-data:www-data $HUBZILLA_PATH/.htconfig.php
583
     chown www-data:www-data $HUBZILLA_PATH/.htconfig.php
584
     chmod 755 $HUBZILLA_PATH/.htconfig.php
584
     chmod 755 $HUBZILLA_PATH/.htconfig.php
585
 
585
 
586
-    systemctl restart php5-fpm
586
+    systemctl restart php-fpm
587
     systemctl restart nginx
587
     systemctl restart nginx
588
     systemctl restart cron
588
     systemctl restart cron
589
 
589
 

+ 5
- 5
src/freedombone-app-koel 파일 보기

479
     function_check repair_databases_script
479
     function_check repair_databases_script
480
     repair_databases_script
480
     repair_databases_script
481
 
481
 
482
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
483
-    apt-get -yq install php5-memcached php5-intl exiftool
482
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
483
+    apt-get -yq install php-memcached php-intl exiftool
484
 
484
 
485
     if [ ! -d /var/www/$KOEL_DOMAIN_NAME ]; then
485
     if [ ! -d /var/www/$KOEL_DOMAIN_NAME ]; then
486
         mkdir /var/www/$KOEL_DOMAIN_NAME
486
         mkdir /var/www/$KOEL_DOMAIN_NAME
554
         echo '  # PHP' >> $koel_nginx_site
554
         echo '  # PHP' >> $koel_nginx_site
555
         echo '  location ~ \.php {' >> $koel_nginx_site
555
         echo '  location ~ \.php {' >> $koel_nginx_site
556
         echo '    include snippets/fastcgi-php.conf;' >> $koel_nginx_site
556
         echo '    include snippets/fastcgi-php.conf;' >> $koel_nginx_site
557
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $koel_nginx_site
557
+        echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $koel_nginx_site
558
         echo '  }' >> $koel_nginx_site
558
         echo '  }' >> $koel_nginx_site
559
         echo '' >> $koel_nginx_site
559
         echo '' >> $koel_nginx_site
560
         echo '  # Location' >> $koel_nginx_site
560
         echo '  # Location' >> $koel_nginx_site
612
     echo '  # PHP' >> $koel_nginx_site
612
     echo '  # PHP' >> $koel_nginx_site
613
     echo '  location ~ \.php {' >> $koel_nginx_site
613
     echo '  location ~ \.php {' >> $koel_nginx_site
614
     echo '    include snippets/fastcgi-php.conf;' >> $koel_nginx_site
614
     echo '    include snippets/fastcgi-php.conf;' >> $koel_nginx_site
615
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $koel_nginx_site
615
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $koel_nginx_site
616
     echo '  }' >> $koel_nginx_site
616
     echo '  }' >> $koel_nginx_site
617
     echo '' >> $koel_nginx_site
617
     echo '' >> $koel_nginx_site
618
     echo '  # Location' >> $koel_nginx_site
618
     echo '  # Location' >> $koel_nginx_site
661
         KOEL_SERVER=${KOEL_ONION_HOSTNAME}
661
         KOEL_SERVER=${KOEL_ONION_HOSTNAME}
662
     fi
662
     fi
663
 
663
 
664
-    systemctl restart php5-fpm
664
+    systemctl restart php-fpm
665
     systemctl restart nginx
665
     systemctl restart nginx
666
 
666
 
667
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a koel -p "$KOEL_ADMIN_PASSWORD"
667
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a koel -p "$KOEL_ADMIN_PASSWORD"

+ 8
- 8
src/freedombone-app-lychee 파일 보기

262
     echo '        try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
262
     echo '        try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
263
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
263
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
264
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
264
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
265
-    echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
265
+    echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
266
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
266
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
267
-    echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
268
-    echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
267
+    echo '        # With php-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
268
+    echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
269
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
269
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
270
     echo '        fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
270
     echo '        fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
271
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
271
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
331
     echo '        try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
331
     echo '        try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
332
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
332
     echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
333
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
333
     echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
334
-    echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
334
+    echo '        # With php-cgi alone:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
335
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
335
     echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
336
-    echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
337
-    echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
336
+    echo '        # With php-fpm:' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
337
+    echo '        fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
338
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
338
     echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
339
     echo '        fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
339
     echo '        fastcgi_index index.html;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
340
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
340
     echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$LYCHEE_DOMAIN_NAME
381
     fi
381
     fi
382
 
382
 
383
     # for the avatar changing command
383
     # for the avatar changing command
384
-    apt-get -yq install imagemagick exif zip php5-mcrypt mcrypt
384
+    apt-get -yq install imagemagick exif zip php-mcrypt mcrypt
385
 
385
 
386
     function_check install_lychee_from_repo
386
     function_check install_lychee_from_repo
387
     install_lychee_from_repo
387
     install_lychee_from_repo
426
     function_check lychee_create_database
426
     function_check lychee_create_database
427
     lychee_create_database
427
     lychee_create_database
428
 
428
 
429
-    systemctl restart php5-fpm
429
+    systemctl restart php-fpm
430
     systemctl restart nginx
430
     systemctl restart nginx
431
 
431
 
432
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a lychee -p "$LYCHEE_ADMIN_PASSWORD"
432
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a lychee -p "$LYCHEE_ADMIN_PASSWORD"

+ 1
- 1
src/freedombone-app-mediagoblin 파일 보기

496
 
496
 
497
     nginx_ensite $MEDIAGOBLIN_DOMAIN_NAME
497
     nginx_ensite $MEDIAGOBLIN_DOMAIN_NAME
498
 
498
 
499
-    systemctl restart php5-fpm
499
+    systemctl restart php-fpm
500
     systemctl restart nginx
500
     systemctl restart nginx
501
 
501
 
502
     function_check add_ddns_domain
502
     function_check add_ddns_domain

+ 5
- 5
src/freedombone-app-movim 파일 보기

319
     function_check repair_databases_script
319
     function_check repair_databases_script
320
     repair_databases_script
320
     repair_databases_script
321
 
321
 
322
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
323
-    apt-get -yq install php5-memcached php5-intl exiftool php5-imagick
322
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
323
+    apt-get -yq install php-memcached php-intl exiftool php-imagick
324
 
324
 
325
     if [ ! -d /var/www/$MOVIM_DOMAIN_NAME ]; then
325
     if [ ! -d /var/www/$MOVIM_DOMAIN_NAME ]; then
326
         mkdir /var/www/$MOVIM_DOMAIN_NAME
326
         mkdir /var/www/$MOVIM_DOMAIN_NAME
435
         echo '  # PHP' >> $movim_nginx_site
435
         echo '  # PHP' >> $movim_nginx_site
436
         echo '  location ~ \.php {' >> $movim_nginx_site
436
         echo '  location ~ \.php {' >> $movim_nginx_site
437
         echo '    include snippets/fastcgi-php.conf;' >> $movim_nginx_site
437
         echo '    include snippets/fastcgi-php.conf;' >> $movim_nginx_site
438
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $movim_nginx_site
438
+        echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $movim_nginx_site
439
         echo '  }' >> $movim_nginx_site
439
         echo '  }' >> $movim_nginx_site
440
         echo '' >> $movim_nginx_site
440
         echo '' >> $movim_nginx_site
441
         echo '  # Location' >> $movim_nginx_site
441
         echo '  # Location' >> $movim_nginx_site
494
     echo '  # PHP' >> $movim_nginx_site
494
     echo '  # PHP' >> $movim_nginx_site
495
     echo '  location ~ \.php {' >> $movim_nginx_site
495
     echo '  location ~ \.php {' >> $movim_nginx_site
496
     echo '    include snippets/fastcgi-php.conf;' >> $movim_nginx_site
496
     echo '    include snippets/fastcgi-php.conf;' >> $movim_nginx_site
497
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $movim_nginx_site
497
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $movim_nginx_site
498
     echo '  }' >> $movim_nginx_site
498
     echo '  }' >> $movim_nginx_site
499
     echo '' >> $movim_nginx_site
499
     echo '' >> $movim_nginx_site
500
     echo '  # Location' >> $movim_nginx_site
500
     echo '  # Location' >> $movim_nginx_site
550
     set_completion_param "movim domain" "$MOVIM_DOMAIN_NAME"
550
     set_completion_param "movim domain" "$MOVIM_DOMAIN_NAME"
551
 
551
 
552
     systemctl start movim
552
     systemctl start movim
553
-    systemctl restart php5-fpm
553
+    systemctl restart php-fpm
554
     systemctl restart nginx
554
     systemctl restart nginx
555
     APP_INSTALLED=1
555
     APP_INSTALLED=1
556
 }
556
 }

+ 9
- 9
src/freedombone-app-nextcloud 파일 보기

339
     function_check remove_nodejs
339
     function_check remove_nodejs
340
     remove_nodejs pleroma-nextcloud
340
     remove_nodejs pleroma-nextcloud
341
 
341
 
342
-    sed -i 's|env[PATH]|;env[PATH]|g' /etc/php5/fpm/pool.d/www.conf
342
+    sed -i 's|env[PATH]|;env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf
343
 
343
 
344
     read_config_param "NEXTCLOUD_DOMAIN_NAME"
344
     read_config_param "NEXTCLOUD_DOMAIN_NAME"
345
     read_config_param "MY_USERNAME"
345
     read_config_param "MY_USERNAME"
367
     function_check remove_ddns_domain
367
     function_check remove_ddns_domain
368
     remove_ddns_domain $NEXTCLOUD_DOMAIN_NAME
368
     remove_ddns_domain $NEXTCLOUD_DOMAIN_NAME
369
     systemctl restart nginx
369
     systemctl restart nginx
370
-    systemctl restart php5-fpm
370
+    systemctl restart php-fpm
371
 }
371
 }
372
 
372
 
373
 function install_nextcloud_main {
373
 function install_nextcloud_main {
389
     function_check repair_databases_script
389
     function_check repair_databases_script
390
     repair_databases_script
390
     repair_databases_script
391
 
391
 
392
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
393
-    apt-get -yq install php5-memcached php5-intl memcached php5-memcached
392
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
393
+    apt-get -yq install php-memcached php-intl memcached php-memcached
394
 
394
 
395
     # Ensure PATH is available to php
395
     # Ensure PATH is available to php
396
-    if [ ! -f /etc/php5/fpm/pool.d/www.conf ]; then
396
+    if [ ! -f /etc/php7.0/fpm/pool.d/www.conf ]; then
397
        echo $'No php www configuration file found'
397
        echo $'No php www configuration file found'
398
        exit 628757
398
        exit 628757
399
     fi
399
     fi
400
-    sed -i 's|;env[PATH]|env[PATH]|g' /etc/php5/fpm/pool.d/www.conf
400
+    sed -i 's|;env[PATH]|env[PATH]|g' /etc/php7.0/fpm/pool.d/www.conf
401
 
401
 
402
     if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then
402
     if [ ! -d /var/www/$NEXTCLOUD_DOMAIN_NAME ]; then
403
         mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME
403
         mkdir /var/www/$NEXTCLOUD_DOMAIN_NAME
463
         echo '  # PHP' >> $nextcloud_nginx_site
463
         echo '  # PHP' >> $nextcloud_nginx_site
464
         echo '  location ~ \.php {' >> $nextcloud_nginx_site
464
         echo '  location ~ \.php {' >> $nextcloud_nginx_site
465
         echo '    include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site
465
         echo '    include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site
466
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $nextcloud_nginx_site
466
+        echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $nextcloud_nginx_site
467
         echo '  }' >> $nextcloud_nginx_site
467
         echo '  }' >> $nextcloud_nginx_site
468
         echo '' >> $nextcloud_nginx_site
468
         echo '' >> $nextcloud_nginx_site
469
         echo '  # Location' >> $nextcloud_nginx_site
469
         echo '  # Location' >> $nextcloud_nginx_site
518
     echo '  # PHP' >> $nextcloud_nginx_site
518
     echo '  # PHP' >> $nextcloud_nginx_site
519
     echo '  location ~ \.php {' >> $nextcloud_nginx_site
519
     echo '  location ~ \.php {' >> $nextcloud_nginx_site
520
     echo '    include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site
520
     echo '    include snippets/fastcgi-php.conf;' >> $nextcloud_nginx_site
521
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $nextcloud_nginx_site
521
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $nextcloud_nginx_site
522
     echo '  }' >> $nextcloud_nginx_site
522
     echo '  }' >> $nextcloud_nginx_site
523
     echo '' >> $nextcloud_nginx_site
523
     echo '' >> $nextcloud_nginx_site
524
     echo '  # Location' >> $nextcloud_nginx_site
524
     echo '  # Location' >> $nextcloud_nginx_site
592
         NEXTCLOUD_SERVER=${NEXTCLOUD_ONION_HOSTNAME}
592
         NEXTCLOUD_SERVER=${NEXTCLOUD_ONION_HOSTNAME}
593
     fi
593
     fi
594
 
594
 
595
-    systemctl restart php5-fpm
595
+    systemctl restart php-fpm
596
     systemctl restart nginx
596
     systemctl restart nginx
597
 
597
 
598
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$NEXTCLOUD_DOMAIN_NAME" -g nextcloud --public no
598
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$NEXTCLOUD_DOMAIN_NAME" -g nextcloud --public no

+ 5
- 5
src/freedombone-app-postactiv 파일 보기

540
     function_check repair_databases_script
540
     function_check repair_databases_script
541
     repair_databases_script
541
     repair_databases_script
542
 
542
 
543
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git curl php-xml-parser
544
-    apt-get -yq install php5-memcached php5-intl exiftool
543
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git curl
544
+    apt-get -yq install php-memcached php-intl exiftool
545
 
545
 
546
     if [ ! -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
546
     if [ ! -d /var/www/$POSTACTIV_DOMAIN_NAME ]; then
547
         mkdir /var/www/$POSTACTIV_DOMAIN_NAME
547
         mkdir /var/www/$POSTACTIV_DOMAIN_NAME
617
         echo '  # PHP' >> $postactiv_nginx_site
617
         echo '  # PHP' >> $postactiv_nginx_site
618
         echo '  location ~ \.php {' >> $postactiv_nginx_site
618
         echo '  location ~ \.php {' >> $postactiv_nginx_site
619
         echo '    include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site
619
         echo '    include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site
620
-        echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $postactiv_nginx_site
620
+        echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $postactiv_nginx_site
621
         echo '  }' >> $postactiv_nginx_site
621
         echo '  }' >> $postactiv_nginx_site
622
         echo '' >> $postactiv_nginx_site
622
         echo '' >> $postactiv_nginx_site
623
         echo '  # Location' >> $postactiv_nginx_site
623
         echo '  # Location' >> $postactiv_nginx_site
665
     echo '  # PHP' >> $postactiv_nginx_site
665
     echo '  # PHP' >> $postactiv_nginx_site
666
     echo '  location ~ \.php {' >> $postactiv_nginx_site
666
     echo '  location ~ \.php {' >> $postactiv_nginx_site
667
     echo '    include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site
667
     echo '    include snippets/fastcgi-php.conf;' >> $postactiv_nginx_site
668
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> $postactiv_nginx_site
668
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> $postactiv_nginx_site
669
     echo '  }' >> $postactiv_nginx_site
669
     echo '  }' >> $postactiv_nginx_site
670
     echo '' >> $postactiv_nginx_site
670
     echo '' >> $postactiv_nginx_site
671
     echo '  # Location' >> $postactiv_nginx_site
671
     echo '  # Location' >> $postactiv_nginx_site
776
         rm /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/install.php
776
         rm /var/www/$POSTACTIV_DOMAIN_NAME/htdocs/install.php
777
     fi
777
     fi
778
 
778
 
779
-    systemctl restart php5-fpm
779
+    systemctl restart php-fpm
780
     systemctl restart nginx
780
     systemctl restart nginx
781
 
781
 
782
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$POSTACTIV_DOMAIN_NAME" -g postactiv --public no
782
     ${PROJECT_NAME}-addemail -u $MY_USERNAME -e "noreply@$POSTACTIV_DOMAIN_NAME" -g postactiv --public no

+ 6
- 6
src/freedombone-app-rss 파일 보기

294
     function_check remove_onion_service
294
     function_check remove_onion_service
295
     remove_onion_service rss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}
295
     remove_onion_service rss ${RSS_READER_ONION_PORT} ${RSS_MOBILE_READER_ONION_PORT}
296
 
296
 
297
-    apt-get -yq install php-gettext php5-curl php5-gd php5-mysql git
298
-    apt-get -yq install curl php-xml-parser php5-mcrypt
297
+    apt-get -yq install php-gettext php-curl php-gd php-mysql git
298
+    apt-get -yq install curl php-xml-parser php-mcrypt
299
 
299
 
300
     if [ ! -d /etc/share ]; then
300
     if [ ! -d /etc/share ]; then
301
         mkdir /etc/share
301
         mkdir /etc/share
337
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
337
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
338
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
338
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
339
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
339
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
340
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
340
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
341
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
341
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
342
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
342
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
343
     echo '  location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
343
     echo '  location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
375
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
375
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
376
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
376
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
377
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
377
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
378
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
378
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
379
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
379
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
380
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
380
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
381
     echo '  set $mobile_rewrite do_not_perform;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
381
     echo '  set $mobile_rewrite do_not_perform;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
396
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
396
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
397
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
397
     echo '  location ~ \.php {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
398
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
398
     echo '    include snippets/fastcgi-php.conf;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
399
-    echo '    fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
399
+    echo '    fastcgi_pass unix:/var/run/php-fpm.sock;' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
400
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
400
     echo '  }' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
401
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
401
     echo '' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
402
     echo '  location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
402
     echo '  location / {' >> /etc/nginx/sites-available/$RSS_READER_DOMAIN_NAME
482
     configure_php
482
     configure_php
483
 
483
 
484
     nginx_ensite $RSS_READER_DOMAIN_NAME
484
     nginx_ensite $RSS_READER_DOMAIN_NAME
485
-    systemctl restart php5-fpm
485
+    systemctl restart php-fpm
486
     systemctl restart nginx
486
     systemctl restart nginx
487
 
487
 
488
     # daemon to update feeds
488
     # daemon to update feeds

+ 1
- 1
src/freedombone-app-searx 파일 보기

930
     nginx_ensite searx
930
     nginx_ensite searx
931
 
931
 
932
     # restart the web server
932
     # restart the web server
933
-    systemctl restart php5-fpm
933
+    systemctl restart php-fpm
934
     systemctl restart nginx
934
     systemctl restart nginx
935
 
935
 
936
     # start the daemon
936
     # start the daemon

+ 1
- 1
src/freedombone-image-customise 파일 보기

1175
 
1175
 
1176
     # web server
1176
     # web server
1177
     chroot "$rootdir" apt-get -yq remove --purge apache2
1177
     chroot "$rootdir" apt-get -yq remove --purge apache2
1178
-    chroot "$rootdir" apt-get -yq install nginx php5-fpm
1178
+    chroot "$rootdir" apt-get -yq install nginx php-fpm
1179
     git clone $NGINX_ENSITE_REPO $rootdir/root/build/nginx_ensite
1179
     git clone $NGINX_ENSITE_REPO $rootdir/root/build/nginx_ensite
1180
     cd $rootdir/root/build/nginx_ensite
1180
     cd $rootdir/root/build/nginx_ensite
1181
     git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT
1181
     git checkout $NGINX_ENSITE_COMMIT -b $NGINX_ENSITE_COMMIT

+ 6
- 6
src/freedombone-logging 파일 보기

99
     if [ -f /etc/mumble-server.ini ]; then
99
     if [ -f /etc/mumble-server.ini ]; then
100
         sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
100
         sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
101
     fi
101
     fi
102
-    if [ -f /etc/php5/fpm/php-fpm.conf ]; then
103
-        sed -i 's|error_log =.*|error_log = /var/log/php5-fpm.log|g' /etc/php5/fpm/php-fpm.conf
102
+    if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then
103
+        sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php7.0/fpm/php-fpm.conf
104
     fi
104
     fi
105
     if [ -d /etc/nginx ]; then
105
     if [ -d /etc/nginx ]; then
106
         if [ ! -d /var/log/nginx ]; then
106
         if [ ! -d /var/log/nginx ]; then
180
         shred -zu /var/log/radicale/*
180
         shred -zu /var/log/radicale/*
181
         rm -rf /var/log/radicale
181
         rm -rf /var/log/radicale
182
     fi
182
     fi
183
-    if [ -f /etc/php5/fpm/php-fpm.conf ]; then
184
-        sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php5/fpm/php-fpm.conf
185
-        shred -zu /var/log/php5-fpm.*
183
+    if [ -f /etc/php7.0/fpm/php-fpm.conf ]; then
184
+        sed -i 's|error_log =.*|error_log = /dev/null|g' /etc/php7.0/fpm/php-fpm.conf
185
+        shred -zu /var/log/php-fpm.*
186
     fi
186
     fi
187
     if [ -d /etc/nginx ]; then
187
     if [ -d /etc/nginx ]; then
188
         for filename in /etc/nginx/sites-available/* ; do
188
         for filename in /etc/nginx/sites-available/* ; do
246
     fi
246
     fi
247
 fi
247
 fi
248
 if [ -d /etc/nginx ]; then
248
 if [ -d /etc/nginx ]; then
249
-    systemctl restart php5-fpm
249
+    systemctl restart php-fpm
250
     systemctl restart nginx
250
     systemctl restart nginx
251
 fi
251
 fi
252
 if [ -f /etc/init.d/spamassassin ]; then
252
 if [ -f /etc/init.d/spamassassin ]; then

+ 15
- 15
src/freedombone-utils-web 파일 보기

401
 }
401
 }
402
 
402
 
403
 function configure_php {
403
 function configure_php {
404
-    sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php5/fpm/php.ini
405
-    sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini
406
-    sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php5/cli/php.ini
407
-    sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php5/fpm/php.ini
408
-    sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php5/fpm/php.ini
404
+    sed -i "s/memory_limit = 128M/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/fpm/php.ini
405
+    sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php7.0/fpm/php.ini
406
+    sed -i "s/memory_limit = -1/memory_limit = ${MAX_PHP_MEMORY}M/g" /etc/php7.0/cli/php.ini
407
+    sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php7.0/fpm/php.ini
408
+    sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php7.0/fpm/php.ini
409
 }
409
 }
410
 
410
 
411
 function install_web_server_access_control {
411
 function install_web_server_access_control {
552
     fi
552
     fi
553
     # install nginx
553
     # install nginx
554
     apt-get -yq install nginx
554
     apt-get -yq install nginx
555
-    apt-get -yq install php5-fpm git
555
+    apt-get -yq install php-fpm git
556
 
556
 
557
     # Turn off logs by default
557
     # Turn off logs by default
558
     sed -i 's|access_log.*|access_log = /dev/null;|g' /etc/nginx/nginx.conf
558
     sed -i 's|access_log.*|access_log = /dev/null;|g' /etc/nginx/nginx.conf
559
     sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf
559
     sed -i 's|error_log.*|error_log = /dev/null;|g' /etc/nginx/nginx.conf
560
 
560
 
561
     # limit the number of php processes
561
     # limit the number of php processes
562
-    sed -i 's/; process.max =.*/process.max = 32/g' /etc/php5/fpm/php-fpm.conf
563
-    #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php5/fpm/php-fpm.conf
564
-
565
-    if ! grep -q "pm.max_children" /etc/php5/fpm/php-fpm.conf; then
566
-        echo 'pm.max_children = 10' >> /etc/php5/fpm/php-fpm.conf
567
-        echo 'pm.start_servers = 2' >> /etc/php5/fpm/php-fpm.conf
568
-        echo 'pm.min_spare_servers = 2' >> /etc/php5/fpm/php-fpm.conf
569
-        echo 'pm.max_spare_servers = 5' >> /etc/php5/fpm/php-fpm.conf
570
-        echo 'pm.max_requests = 50' >> /etc/php5/fpm/php-fpm.conf
562
+    sed -i 's/; process.max =.*/process.max = 32/g' /etc/php7.0/fpm/php-fpm.conf
563
+    #sed -i 's/;process_control_timeout =.*/process_control_timeout = 300/g' /etc/php7.0/fpm/php-fpm.conf
564
+
565
+    if ! grep -q "pm.max_children" /etc/php7.0/fpm/php-fpm.conf; then
566
+        echo 'pm.max_children = 10' >> /etc/php7.0/fpm/php-fpm.conf
567
+        echo 'pm.start_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf
568
+        echo 'pm.min_spare_servers = 2' >> /etc/php7.0/fpm/php-fpm.conf
569
+        echo 'pm.max_spare_servers = 5' >> /etc/php7.0/fpm/php-fpm.conf
570
+        echo 'pm.max_requests = 50' >> /etc/php7.0/fpm/php-fpm.conf
571
     fi
571
     fi
572
 
572
 
573
     if [ ! -d /etc/nginx ]; then
573
     if [ ! -d /etc/nginx ]; then