Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into feature/26-custom-pages

Browse source
This commit is contained in:
Jamie Curnow 2019-03-04 15:53:24 +10:00
commit eed9c9650f
7 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkinsfile vendored
View file

@ -81,11 +81,11 @@ pipeline {
}
}
stage('Build Master') {
when {
branch 'master'
}
parallel {
stage('x86_64') {
when {
branch 'master'
}
steps {
ansiColor('xterm') {
// Codebase
@ -127,9 +127,6 @@ pipeline {
}
}
stage('armhf') {
when {
branch 'master'
}
agent {
label 'armhf'
}
@ -173,9 +170,6 @@ pipeline {
}
}
stage('arm64') {
when {
branch 'master'
}
agent {
label 'arm64'
}

2
README.md
View file

@ -2,7 +2,7 @@
# Nginx Proxy Manager
![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

2
doc/DOCKERHUB.md
View file

@ -2,7 +2,7 @@
# Nginx Proxy Manager
![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge)
![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

20
doc/INSTALL.md
View file

@ -143,3 +143,23 @@ Password: changeme
```
Immediately after logging in with this default user you will be asked to modify your details and change your password.
### Advanced Options
#### X-FRAME-OPTIONS Header
You can configure the [`X-FRAME-OPTIONS`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options) header
value by specifying it as a Docker environment variable. The default if not specified is `deny`.
```yml
...
environment:
X_FRAME_OPTIONS: "sameorigin"
...
```
```
... -e "X_FRAME_OPTIONS=sameorigin" ...
```

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "nginx-proxy-manager",
"version": "2.0.9",
"version": "2.0.10",
"description": "A beautiful interface for creating Nginx endpoints",
"main": "src/backend/index.js",
"devDependencies": {

8
src/backend/app.js
View file

@ -40,11 +40,17 @@ app.use(require('./lib/express/cors'));
// General security/cache related headers + server header
app.use(function (req, res, next) {
let x_frame_options = 'DENY';
if (typeof process.env.X_FRAME_OPTIONS !== 'undefined' && process.env.X_FRAME_OPTIONS) {
x_frame_options = process.env.X_FRAME_OPTIONS;
}
res.set({
'Strict-Transport-Security': 'includeSubDomains; max-age=631138519; preload',
'X-XSS-Protection': '0',
'X-Content-Type-Options': 'nosniff',
'X-Frame-Options': 'DENY',
'X-Frame-Options': x_frame_options,
'Cache-Control': 'no-cache, no-store, max-age=0, must-revalidate',
Pragma: 'no-cache',
Expires: 0

2
src/backend/index.js
View file

@ -1,7 +1,5 @@
#!/usr/bin/env node
'use strict';
const logger = require('./logger').global;
function appStart () {