Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Dave Lane
docker-grav
Commits
b7bae90d
Commit
b7bae90d
authored
Nov 13, 2018
by
Dave Lane
Browse files
Options
Browse Files
Download
Plain Diff
shifting to a sample docker-compose.yml file and updated nginx conf
parents
6f162bba
55ff8f1f
Pipeline
#253
canceled with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
5 deletions
+32
-5
docker-compose.yml.sample
docker-compose.yml.sample
+14
-2
nginx/default.conf
nginx/default.conf
+18
-3
No files found.
docker-compose.yml
→
docker-compose.yml
.sample
View file @
b7bae90d
...
...
@@ -8,19 +8,27 @@ services:
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- redis.grav.troy
=======
- redis.grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
app:
image: kiwilightweight/grav
links:
- redis
volumes:
-
/home/da
ve/Project
s/grav
/new
:/var/www/html
- /home/da
ta/nzos
s/grav:/var/www/html
restart:
unless-stopped
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- grav.troy
=======
- grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
nginx:
image: oeru/nginx-jessie
links:
...
...
@@ -31,9 +39,13 @@ services:
volumes:
- ./nginx:/etc/nginx/conf.d
- ./nginx/cache:/var/cache/nginx
-
/home/da
ve/Project
s/grav
/new
:/var/www/html
- /home/da
ta/nzos
s/grav:/var/www/html
restart: unless-stopped
networks:
default:
aliases:
<<<<<<< HEAD:docker-compose.yml
- nginx.grav.troy
=======
- nginx.grav.nzoss.nz
>>>>>>> 55ff8f1fcedb9b67997ba36bc88ccd2bdae35535:docker-compose.yml.sample
nginx/default.conf
View file @
b7bae90d
...
...
@@ -11,12 +11,25 @@ server {
# to use `/subfolder/index.php`
location
/ {
try_files
$
uri
$
uri
/ /
index
.
php
?$
query_string
;
#try_files $uri $uri/ /index.php;
}
## End - Index
## Begin - PHP-FPM Configuration
## Begin - Security
# deny all direct access for these folders
location
~* /(\.
git
|
cache
|
bin
|
logs
|
backup
|
tests
)/.*$ {
return
403
; }
# deny running scripts inside core system folders
location
~* /(
system
|
vendor
)/.*\.(
txt
|
xml
|
md
|
html
|
yaml
|
yml
|
php
|
pl
|
py
|
cgi
|
twig
|
sh
|
bat
)$ {
return
403
; }
# deny running scripts inside user folder
location
~* /
user
/.*\.(
txt
|
md
|
yaml
|
yml
|
php
|
pl
|
py
|
cgi
|
twig
|
sh
|
bat
)$ {
return
403
; }
# deny access to specific files in the root folder
location
~ /(
LICENSE
\.
txt
|
composer
\.
lock
|
composer
\.
json
|
nginx
\.
conf
|
web
\.
config
|
htaccess
\.
txt
|\.
htaccess
) {
return
403
; }
## End - Security
## Begin - PHP
location
~ \.
php
$ {
# Choose either a socket or TCP/IP address
#fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_pass
app
:
9000
;
fastcgi_split_path_info
^(.+\.
php
)(/.+)$;
...
...
@@ -24,9 +37,8 @@ server {
include
fastcgi_params
;
fastcgi_param
SCRIPT_FILENAME
$
document_root
/$
fastcgi_script_name
;
}
## End - PHP
client_max_body_size
100
m
;
<<<<<<<
HEAD
## Begin - Security
# deny all direct access for these folders
...
...
@@ -38,4 +50,7 @@ server {
# deny access to specific files in the root folder
location
~ /(
LICENSEi
\.
txt
|
composer
\.
lock
|
composer
\.
json
|
nginx
\.
conf
|
web
\.
config
|
htaccess
\.
txt
|\.
htaccess
) {
return
403
; }
## End - Security
=======
## End - PHP
>>>>>>>
55
ff8f1fcedb9b67997ba36bc88ccd2bdae35535
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment