瀏覽代碼

php option

Bob Mottram 7 年之前
父節點
當前提交
7d70a117fa
共有 2 個檔案被更改,包括 14 行新增4 行删除
  1. 2
    2
      src/freedombone-app-bludit
  2. 12
    2
      src/freedombone-template

+ 2
- 2
src/freedombone-app-bludit 查看文件

314
           echo '  # Location';
314
           echo '  # Location';
315
           echo '  location / {'; } >> "$bludit_nginx_site"
315
           echo '  location / {'; } >> "$bludit_nginx_site"
316
         nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
316
         nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
317
-        { echo "    try_files \$uri \$uri/ /index.html;";
317
+        { echo "    try_files \$uri \$uri/ /index.php?\$args;";
318
           echo '  }';
318
           echo '  }';
319
           echo '}'; } >> "$bludit_nginx_site"
319
           echo '}'; } >> "$bludit_nginx_site"
320
     else
320
     else
345
       echo '  # Location';
345
       echo '  # Location';
346
       echo '  location / {'; } >> "$bludit_nginx_site"
346
       echo '  location / {'; } >> "$bludit_nginx_site"
347
     nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
347
     nginx_limits "$BLUDIT_DOMAIN_NAME" '15m'
348
-    { echo "    try_files \$uri \$uri/ index.html;";
348
+    { echo "    try_files \$uri \$uri/ index.php?\$args;";
349
       echo '  }';
349
       echo '  }';
350
       echo '}'; } >> "$bludit_nginx_site"
350
       echo '}'; } >> "$bludit_nginx_site"
351
 
351
 

+ 12
- 2
src/freedombone-template 查看文件

686
         echo "          echo '    include snippets/fastcgi-php.conf;';"
686
         echo "          echo '    include snippets/fastcgi-php.conf;';"
687
         echo "          echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
687
         echo "          echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
688
         echo "          echo '    fastcgi_read_timeout 30;';"
688
         echo "          echo '    fastcgi_read_timeout 30;';"
689
+        echo "          echo '    fastcgi_param HTTPS on;';"
689
         echo "          echo '  }';"
690
         echo "          echo '  }';"
690
         echo "          echo '';"
691
         echo "          echo '';"
691
     else
692
     else
695
     echo "          echo '  location / {'; } >> \"\$${app_name}_nginx_site\""
696
     echo "          echo '  location / {'; } >> \"\$${app_name}_nginx_site\""
696
     echo "        nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
697
     echo "        nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
697
     if [ ! $app_daemon ]; then
698
     if [ ! $app_daemon ]; then
698
-        echo "        { echo \"    try_files \\\$uri \\\$uri/ /index.html;\";"
699
+        if [[ "$app_php" != 'yes' ]]; then
700
+            echo "        { echo \"    try_files \\\$uri \\\$uri/ /index.html;\";"
701
+        else
702
+            echo "        { echo \"    try_files \\\$uri \\\$uri/ /index.php?\\\$args;\";"
703
+        fi
699
     else
704
     else
700
         echo "        { echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
705
         echo "        { echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
701
     fi
706
     fi
728
     echo "      echo '    include snippets/fastcgi-php.conf;';"
733
     echo "      echo '    include snippets/fastcgi-php.conf;';"
729
     echo "      echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
734
     echo "      echo '    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;';"
730
     echo "      echo '    fastcgi_read_timeout 30;';"
735
     echo "      echo '    fastcgi_read_timeout 30;';"
736
+    echo "      echo '    fastcgi_param HTTPS off;';"
731
     echo "      echo '  }';"
737
     echo "      echo '  }';"
732
     echo "      echo '';"
738
     echo "      echo '';"
733
 else
739
 else
737
 echo "      echo '  location / {'; } >> \"\$${app_name}_nginx_site\""
743
 echo "      echo '  location / {'; } >> \"\$${app_name}_nginx_site\""
738
 echo "    nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
744
 echo "    nginx_limits \"\$${app_name_upper}_DOMAIN_NAME\" '15m'"
739
 if [ ! $app_daemon ]; then
745
 if [ ! $app_daemon ]; then
740
-    echo "    { echo \"    try_files \\\$uri \\\$uri/ index.html;\";"
746
+    if [[ "$app_php" != 'yes' ]]; then
747
+        echo "    { echo \"    try_files \\\$uri \\\$uri/ index.html;\";"
748
+    else
749
+        echo "    { echo \"    try_files \\\$uri \\\$uri/ index.php?\\\$args;\";"
750
+    fi
741
 else
751
 else
742
     echo "      echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
752
     echo "      echo \"    proxy_pass http://localhost:\$${app_name_upper}_PORT_INTERNAL;\";"
743
 fi
753
 fi