Nginx conf
This commit is contained in:
parent
b7b4913d24
commit
8c33fa58c1
|
@ -2,7 +2,8 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="cf1e275f-fbc1-41d4-a421-0f55447b6367" name="Default" comment="">
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
|
||||
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app_nginx.conf" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Procfile" afterPath="$PROJECT_DIR$/Procfile" />
|
||||
</list>
|
||||
<ignored path="resume.iws" />
|
||||
<ignored path=".idea/workspace.xml" />
|
||||
|
@ -44,7 +45,7 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="package.json" pinned="false" current-in-tab="true">
|
||||
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/package.json">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="396">
|
||||
|
@ -54,6 +55,26 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="app_nginx.conf" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app_nginx.conf">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="220">
|
||||
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="Procfile" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/Procfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="79" selection-start-line="0" selection-start-column="79" selection-end-line="0" selection-end-column="79" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="resume.html.twig" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/views/resume.html.twig">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
@ -87,16 +108,6 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="App.php" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/App.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="792">
|
||||
<caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="uikit.html.twig" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/views/uikit.html.twig">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
@ -121,23 +132,6 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="resume.less" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Sikofitt/less/resume.less">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1078">
|
||||
<caret line="50" column="1" selection-start-line="50" selection-start-column="1" selection-end-line="50" selection-end-column="1" />
|
||||
<folding>
|
||||
<marker date="1468031890828" expanded="true" signature="359:420" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="436:467" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="484:717" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="683:715" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="735:837" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="795:834" ph="{...}" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="config.yml" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/app/config/config.yml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
|
@ -181,6 +175,8 @@
|
|||
<option value="$PROJECT_DIR$/web/index.php" />
|
||||
<option value="$PROJECT_DIR$/data/resume.json" />
|
||||
<option value="$PROJECT_DIR$/package.json" />
|
||||
<option value="$PROJECT_DIR$/app_nginx.conf" />
|
||||
<option value="$PROJECT_DIR$/Procfile" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
@ -417,12 +413,12 @@
|
|||
<workItem from="1467606347040" duration="3843000" />
|
||||
<workItem from="1467840020930" duration="1614000" />
|
||||
<workItem from="1467938148836" duration="1798000" />
|
||||
<workItem from="1468092833685" duration="1880000" />
|
||||
<workItem from="1468092833685" duration="2222000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="30807000" />
|
||||
<option name="totallyTimeSpent" value="31149000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="106" width="1701" height="893" extended-state="0" />
|
||||
|
@ -489,29 +485,6 @@
|
|||
<watches-manager />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/src/Sikofitt/less/resume.less">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1078">
|
||||
<caret line="49" column="1" selection-start-line="49" selection-start-column="1" selection-end-line="49" selection-end-column="1" />
|
||||
<folding>
|
||||
<marker date="1468031890828" expanded="true" signature="359:420" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="436:467" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="484:717" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="683:715" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="735:837" ph="{...}" />
|
||||
<marker date="1468031890828" expanded="true" signature="795:834" ph="{...}" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app/config/config.yml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="88">
|
||||
<caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/web/index.php">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2024">
|
||||
|
@ -900,5 +873,21 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/app_nginx.conf">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="220">
|
||||
<caret line="10" column="19" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Procfile">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="0">
|
||||
<caret line="0" column="79" selection-start-line="0" selection-start-column="79" selection-end-line="0" selection-end-column="79" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
2
Procfile
2
Procfile
|
@ -1 +1 @@
|
|||
web: vendor/heroku/heroku-buildpack-php/bin/heroku-php-nginx web/
|
||||
web: vendor/heroku/heroku-buildpack-php/bin/heroku-php-nginx -C app_nginx.conf web/
|
||||
|
|
|
@ -0,0 +1,14 @@
|
|||
location / {
|
||||
# try to serve file directly, fallback to rewrite
|
||||
try_files $uri @rewriteapp;
|
||||
}
|
||||
|
||||
location @rewriteapp {
|
||||
# rewrite all to app.php
|
||||
rewrite ^(.*)$ /index.php/$1 last;
|
||||
}
|
||||
|
||||
location ~ ^/(index|app_dev|config)\.php(/|$) {
|
||||
try_files @heroku-fcgi @heroku-fcgi;
|
||||
internal;
|
||||
}
|
Loading…
Reference in New Issue