浏览代码

memory limit

Bob Mottram 10 年前
父节点
当前提交
fd71e7452f
共有 1 个文件被更改,包括 7 次插入6 次删除
  1. 7
    6
      install-freedombone.sh

+ 7
- 6
install-freedombone.sh 查看文件

@@ -1545,6 +1545,7 @@ function configure_php {
1545 1545
   sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/g" /etc/php5/fpm/php.ini
1546 1546
   sed -i "s/post_max_size = 8M/post_max_size = 50M/g" /etc/php5/fpm/php.ini
1547 1547
   sed -i "s/memory_limit = /memory_limit = $MAX_PHP_MEMORYM/g" /etc/php5/cli/php.ini
1548
+  sed -i "s/memory_limit = /memory_limit = $MAX_PHP_MEMORYM/g" /etc/php5/fpm/php.ini
1548 1549
 }
1549 1550
 
1550 1551
 function install_owncloud {
@@ -1909,20 +1910,18 @@ function install_wiki {
1909 1910
       echo 'webm    video/webm' >> /var/www/$WIKI_DOMAIN_NAME/htdocs/conf/mime.conf
1910 1911
   fi
1911 1912
 
1912
-  configure_php
1913
-
1914 1913
   echo 'server {' > /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1915 1914
   echo '    listen 80;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1916 1915
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1917 1916
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1918 1917
   echo "    error_log /var/www/$WIKI_DOMAIN_NAME/error.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1919
-  echo '    index index.html index.htm index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1918
+  echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1920 1919
   echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1921 1920
   echo '    # Uncomment this if you need to redirect HTTP to HTTPS' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1922 1921
   echo '    #rewrite ^ https://$server_name$request_uri? permanent;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1923 1922
   echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1924 1923
   echo '    location / {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1925
-  echo '        try_files $uri $uri/ /index.html;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1924
+  echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1926 1925
   echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1927 1926
   echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1928 1927
   echo '    location ~ \.php$ {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -1938,7 +1937,7 @@ function install_wiki {
1938 1937
   echo "    root /var/www/$WIKI_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1939 1938
   echo "    server_name $WIKI_DOMAIN_NAME;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1940 1939
   echo "    error_log /var/www/$WIKI_DOMAIN_NAME/error_ssl.log;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1941
-  echo '    index index.html index.htm index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1940
+  echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1942 1941
   echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1943 1942
   echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1944 1943
   echo '    client_body_buffer_size 128k;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -1992,7 +1991,7 @@ function install_wiki {
1992 1991
   echo "        # server, which is entirely possible with php-fpm/php-fcgi." >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1993 1992
   echo "        # Comment the 'try_files' line out if you set up php-fpm/php-fcgi on" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1994 1993
   echo "        # another machine. And then cross your fingers that you won't get hacked." >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1995
-  echo "        try_files $uri =404;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1994
+  echo "        try_files $uri /dev/null =404;" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1996 1995
   echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1997 1996
   echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
1998 1997
   echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -2015,6 +2014,8 @@ function install_wiki {
2015 2014
   echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
2016 2015
   echo '}' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
2017 2016
 
2017
+  configure_php
2018
+
2018 2019
   nginx_ensite $WIKI_DOMAIN_NAME
2019 2020
   service php5-fpm restart
2020 2021
   service nginx restart