SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ngineered/nginx-php-fpm

Browse Source
This commit is contained in:
Ric Harvey
2017-11-04 20:59:56 +00:00
parent 146cf3f234 99565f7de1
commit e120c77675
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,6 +1,6 @@
FROM php:7.1.11-fpm-alpine FROM php:7.1.11-fpm-alpine
MAINTAINER Ric Harvey <ric@ngd.io> LABEL maintainer="Ric Harvey <ric@ngd.io>"
ENV php_conf /usr/local/etc/php-fpm.conf ENV php_conf /usr/local/etc/php-fpm.conf
ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf

2
conf/nginx-site-ssl.conf
View File

@@ -60,7 +60,7 @@ server {
include fastcgi_params; include fastcgi_params;
} }
location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { location ~* \.(jpg|jpeg|gif|png|css|js|ico|webp|tiff|ttf|svg)$ {
expires 5d; expires 5d;
} }

2
conf/nginx-site.conf
View File

@@ -53,7 +53,7 @@ server {
include fastcgi_params; include fastcgi_params;
} }
location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { location ~* \.(jpg|jpeg|gif|png|css|js|ico|webp|tiff|ttf|svg)$ {
expires 5d; expires 5d;
} }

2
docs/git_auth.md
View File

@@ -2,7 +2,7 @@
There are two methods of pulling code from git, you can either use a Personal Token (recommended method) or an SSH key. There are two methods of pulling code from git, you can either use a Personal Token (recommended method) or an SSH key.
**Note:** We would recommend using a git personal token over an SSH key as it simplifies the set up process. To create a personal access token on Github follow this [guide](https://help.github.com/articles/creating-an-access-token-for-command-line-use/). **Note:** We would recommend using a git personal token over an SSH key as it simplifies the set up process. To create a personal access token on Github follow this [guide](https://help.github.com/articles/creating-an-access-token-for-command-line-use/).
If your repository is on BitBucket, you can create an "app password" and use it as the personnal access token. To get an app password for BitBucket, follow this [guide](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html). If your repository is on BitBucket, you can create an "app password" and use it as the personal access token. To get an app password for BitBucket, follow this [guide](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html).
### Personal Access token ### Personal Access token