nginx php-fpm

master
bulw 7 years ago
parent 94f498646d
commit 0a7dee116e

@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="67467e55-57d9-41b3-ba6d-c3a7264859f8" name="Default Changelist" comment="" /> <list default="true" id="67467e55-57d9-41b3-ba6d-c3a7264859f8" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/ib_buffer_pool" beforeDir="false" afterPath="$PROJECT_DIR$/data/ib_buffer_pool" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/ib_logfile0" beforeDir="false" afterPath="$PROJECT_DIR$/data/ib_logfile0" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/ibdata1" beforeDir="false" afterPath="$PROJECT_DIR$/data/ibdata1" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/ibtmp1" beforeDir="false" afterPath="$PROJECT_DIR$/data/ibtmp1" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" beforeDir="false" afterPath="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" afterDir="false" />
<change beforePath="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" beforeDir="false" afterPath="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -9,30 +18,30 @@
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/docker-compose.yml"> <entry file="file://$PROJECT_DIR$/docker-compose.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="45">
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" /> <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf"> <entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="314"> <state relative-caret-position="325">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" /> <caret line="33" column="56" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf"> <entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281"> <state relative-caret-position="306">
<caret line="150" selection-start-line="150" selection-end-line="150" /> <caret line="150" column="10" selection-start-line="150" selection-start-column="10" selection-end-line="150" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -78,29 +87,44 @@
<find>listen =</find> <find>listen =</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/wwwroot/index.html" /> <option value="$PROJECT_DIR$/wwwroot/index.html" />
<option value="$PROJECT_DIR$/php/Dockerfile" /> <option value="$PROJECT_DIR$/php/Dockerfile" />
<option value="$PROJECT_DIR$/wwwroot/index.php" /> <option value="$PROJECT_DIR$/wwwroot/index.php" />
<option value="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" />
<option value="$PROJECT_DIR$/docker-compose.yml" /> <option value="$PROJECT_DIR$/docker-compose.yml" />
<option value="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" /> <option value="$PROJECT_DIR$/nginx/conf/conf.d/default.conf" />
<option value="$PROJECT_DIR$/php/etc/php-fpm.d/www.conf" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds" fullScreen="true">
<option name="y" value="23" />
<option name="width" value="1280" /> <option name="width" value="1280" />
<option name="height" value="800" /> <option name="height" value="709" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="ProjectPane" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="docker" type="b2602c69:ProjectViewProjectNode" />
<item name="docker" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -132,18 +156,20 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1548635626798</updated> <updated>1548635626798</updated>
<workItem from="1548635628371" duration="17079000" /> <workItem from="1548635628371" duration="17241000" />
<workItem from="1548671830419" duration="481000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17079000" /> <option name="totallyTimeSpent" value="17722000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1280" height="800" extended-state="0" /> <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="Favorites" order="0" side_tool="true" /> <window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.24959612" /> <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2536349" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="1" /> <window_info anchor="bottom" id="Database Changes" order="1" />
<window_info anchor="bottom" id="Version Control" order="2" /> <window_info anchor="bottom" id="Version Control" order="2" />
@ -156,11 +182,11 @@
<window_info anchor="bottom" id="Cvs" order="9" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="10" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="11" /> <window_info anchor="bottom" id="TODO" order="11" />
<window_info anchor="bottom" id="Terminal" order="12" sideWeight="0.49919224" visible="true" weight="0.32876712" /> <window_info active="true" anchor="bottom" id="Terminal" order="12" sideWeight="0.49919224" visible="true" weight="0.28767124" />
<window_info anchor="right" id="Database" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -174,26 +200,12 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-utf"> <entry file="file://$PROJECT_DIR$/nginx/conf/koi-utf" />
<provider selected="true" editor-type-id="text-editor" /> <entry file="file://$PROJECT_DIR$/nginx/conf/koi-win" />
</entry> <entry file="file://$PROJECT_DIR$/nginx/conf/fastcgi_params" />
<entry file="file://$PROJECT_DIR$/nginx/conf/koi-win"> <entry file="file://$PROJECT_DIR$/nginx/conf/mime.types" />
<provider selected="true" editor-type-id="text-editor" /> <entry file="file://$PROJECT_DIR$/nginx/conf/win-utf" />
</entry> <entry file="file://$PROJECT_DIR$/nginx/conf/uwsgi_params" />
<entry file="file://$PROJECT_DIR$/nginx/conf/fastcgi_params">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/nginx/conf/mime.types">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-960" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nginx/conf/win-utf">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/nginx/conf/uwsgi_params">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/wwwroot/index.php"> <entry file="file://$PROJECT_DIR$/wwwroot/index.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
@ -201,14 +213,8 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/php/conf/php-fpm.conf"> <entry file="file://$PROJECT_DIR$/php/conf/php-fpm.conf" />
<provider selected="true" editor-type-id="text-editor" /> <entry file="file://$PROJECT_DIR$/php/conf/php.ini" />
</entry>
<entry file="file://$PROJECT_DIR$/php/conf/php.ini">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1974" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.conf"> <entry file="file://$PROJECT_DIR$/php/etc/php-fpm.conf">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
@ -222,6 +228,13 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/php/Dockerfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/nginx/Dockerfile"> <entry file="file://$PROJECT_DIR$/nginx/Dockerfile">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state>
@ -236,31 +249,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/php/Dockerfile"> <entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="306">
<caret line="3" selection-start-line="3" selection-end-line="3" /> <caret line="150" column="10" selection-start-line="150" selection-start-column="10" selection-end-line="150" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/docker-compose.yml"> <entry file="file://$PROJECT_DIR$/docker-compose.yml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="45">
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" /> <caret line="3" column="24" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf"> <entry file="file://$PROJECT_DIR$/nginx/conf/conf.d/default.conf">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="314"> <state relative-caret-position="325">
<caret line="34" column="13" selection-start-line="34" selection-start-column="13" selection-end-line="34" selection-end-column="13" /> <caret line="33" column="56" selection-start-line="33" selection-start-column="56" selection-end-line="33" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/php/etc/php-fpm.d/www.conf">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="150" selection-start-line="150" selection-end-line="150" />
</state> </state>
</provider> </provider>
</entry> </entry>

@ -1,24 +1,27 @@
3,1 3,2
3,3 10,295
10,256 10,129
10,16 10,77
10,10 10,85
10,242 10,253
10,300 10,87
10,6 10,15
10,288 10,2
10,228 10,3
9,7 9,5
9,4 9,2
9,6 9,3
8,9 8,6
8,5 8,7
8,17 8,11
8,16
8,2
8,3
20,3 20,3
20,2 20,2
20,1 20,1
19,2
19,3 19,3
19,2
19,1 19,1
12,3 12,3
12,2 12,2
@ -42,8 +45,10 @@
11,13 11,13
11,12 11,12
11,11 11,11
11,10
11,9 11,9
11,8 11,8
11,7
11,6 11,6
11,5 11,5
11,4 11,4
@ -61,10 +66,5 @@
10,305 10,305
10,304 10,304
10,303 10,303
18,1
10,302 10,302
10,301
10,227
10,205
10,145
10,139
10,73

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -23,6 +23,8 @@ services:
hostname: demo_php-fpm hostname: demo_php-fpm
container_name: demo_php-fpm container_name: demo_php-fpm
build: ./php build: ./php
ports:
- "9000:9000"
volumes: volumes:
- ./php/etc:/usr/local/etc - ./php/etc:/usr/local/etc
- ./wwwroot:/var/www/html:rw - ./wwwroot:/var/www/html:rw

@ -28,10 +28,10 @@ server {
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
# #
location ~ \.php { location ~ \.php {
fastcgi_pass 127.0.0.1:9000; #fastcgi_pass 127.0.0.1:9000;
#fastcgi_pass unix:/sock/php-cgi.sock; fastcgi_pass unix:/sock/php-cgi.sock;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;
} }

@ -148,8 +148,8 @@ group = www-data
; specific port; ; specific port;
; '/path/to/unix/socket' - to listen on a unix socket. ; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory. ; Note: This value is mandatory.
listen = 127.0.0.1:9000 ;listen = 0.0.0.0.0:9000
;listen = /sock/php-cgi.sock listen = /sock/php-cgi.sock
; Set listen(2) backlog. A value of '-1' means unlimited. ; Set listen(2) backlog. A value of '-1' means unlimited.
; Default Value: 128 (-1 on FreeBSD and OpenBSD) ; Default Value: 128 (-1 on FreeBSD and OpenBSD)

Loading…
Cancel
Save