mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-11-04 09:25:15 +00:00 
			
		
		
		
	Compare commits
	
		
			21 Commits
		
	
	
		
			bump-freed
			...
			33cf8ba1c9
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					33cf8ba1c9 | ||
| 
						 | 
					07a4e5791f | ||
| 
						 | 
					640a1eeb68 | ||
| 
						 | 
					04079e7c10 | ||
| 
						 | 
					25a26d6175 | ||
| 
						 | 
					17246e418f | ||
| 
						 | 
					f7d3ca0b07 | ||
| 
						 | 
					a55de386e7 | ||
| 
						 | 
					e9d4f5b827 | ||
| 
						 | 
					1c1cee3836 | ||
| 
						 | 
					eaf6335694 | ||
| 
						 | 
					ffe05ebd41 | ||
| 
						 | 
					2e9a4f1aed | ||
| 
						 | 
					d17c85e4c8 | ||
| 
						 | 
					dad8d0ca00 | ||
| 
						 | 
					d7e0558a35 | ||
| 
						 | 
					ee41bb5562 | ||
| 
						 | 
					0cf6b9caa4 | ||
| 
						 | 
					68a9baf206 | ||
| 
						 | 
					d92421d098 | ||
| 
						 | 
					96c58b203e | 
@@ -5,6 +5,8 @@ const authModel  = require('../models/auth');
 | 
			
		||||
const helpers    = require('../lib/helpers');
 | 
			
		||||
const TokenModel = require('../models/token');
 | 
			
		||||
 | 
			
		||||
const ERROR_MESSAGE_INVALID_AUTH = 'Invalid email or password';
 | 
			
		||||
 | 
			
		||||
module.exports = {
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
@@ -69,15 +71,15 @@ module.exports = {
 | 
			
		||||
													};
 | 
			
		||||
												});
 | 
			
		||||
										} else {
 | 
			
		||||
											throw new error.AuthError('Invalid password');
 | 
			
		||||
											throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
 | 
			
		||||
										}
 | 
			
		||||
									});
 | 
			
		||||
							} else {
 | 
			
		||||
								throw new error.AuthError('No password auth for user');
 | 
			
		||||
								throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
 | 
			
		||||
							}
 | 
			
		||||
						});
 | 
			
		||||
				} else {
 | 
			
		||||
					throw new error.AuthError('No relevant user found');
 | 
			
		||||
					throw new error.AuthError(ERROR_MESSAGE_INVALID_AUTH);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
	},
 | 
			
		||||
 
 | 
			
		||||
@@ -49,8 +49,7 @@
 | 
			
		||||
										"minLength": 1
 | 
			
		||||
									},
 | 
			
		||||
									"password": {
 | 
			
		||||
										"type": "string",
 | 
			
		||||
										"minLength": 1
 | 
			
		||||
										"type": "string"
 | 
			
		||||
									}
 | 
			
		||||
								}
 | 
			
		||||
							}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    auth_basic            "Authorization required";
 | 
			
		||||
    auth_basic_user_file  /data/access/{{ access_list_id }};
 | 
			
		||||
 | 
			
		||||
    {% if access_list.pass_auth == 0 %}
 | 
			
		||||
    {% if access_list.pass_auth == 0 or access_list.pass_auth == true %}
 | 
			
		||||
    proxy_set_header Authorization "";
 | 
			
		||||
    {% endif %}
 | 
			
		||||
 | 
			
		||||
@@ -17,7 +17,7 @@
 | 
			
		||||
    deny all;
 | 
			
		||||
 | 
			
		||||
    # Access checks must...
 | 
			
		||||
    {% if access_list.satisfy_any == 1 %}
 | 
			
		||||
    {% if access_list.satisfy_any == 1 or access_list.satisfy_any == true %}
 | 
			
		||||
    satisfy any;
 | 
			
		||||
    {% else %}
 | 
			
		||||
    satisfy all;
 | 
			
		||||
 
 | 
			
		||||
@@ -5,11 +5,16 @@
 | 
			
		||||
  #listen [::]:80;
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if certificate -%}
 | 
			
		||||
  listen 443 ssl{% if http2_support == 1 or http2_support == true %} http2{% endif %};
 | 
			
		||||
  listen 443 ssl;
 | 
			
		||||
{% if ipv6 -%}
 | 
			
		||||
  listen [::]:443 ssl{% if http2_support == 1 or http2_support == true %} http2{% endif %};
 | 
			
		||||
  listen [::]:443 ssl;
 | 
			
		||||
{% else -%}
 | 
			
		||||
  #listen [::]:443;
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% endif %}
 | 
			
		||||
  server_name {{ domain_names | join: " " }};
 | 
			
		||||
{% if http2_support == 1 or http2_support == true %}
 | 
			
		||||
  http2 on;
 | 
			
		||||
{% else -%}
 | 
			
		||||
  http2 off;
 | 
			
		||||
{% endif %}
 | 
			
		||||
@@ -7,11 +7,7 @@
 | 
			
		||||
    proxy_set_header X-Forwarded-For    $remote_addr;
 | 
			
		||||
    proxy_set_header X-Real-IP		$remote_addr;
 | 
			
		||||
 | 
			
		||||
    set $proxy_forward_scheme {{ forward_scheme }};
 | 
			
		||||
    set $proxy_server         "{{ forward_host }}";
 | 
			
		||||
    set $proxy_port           {{ forward_port }};
 | 
			
		||||
 | 
			
		||||
    proxy_pass       $proxy_forward_scheme://$proxy_server:$proxy_port{{ forward_path }};
 | 
			
		||||
    proxy_pass       {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
 | 
			
		||||
 | 
			
		||||
    {% include "_access.conf" %}
 | 
			
		||||
    {% include "_assets.conf" %}
 | 
			
		||||
 
 | 
			
		||||
@@ -137,5 +137,13 @@ Email:    admin@example.com
 | 
			
		||||
Password: changeme
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
Immediately after logging in with this default user you will be asked to modify your details and change your password.
 | 
			
		||||
Immediately after logging in with this default user you will be asked to modify your details and change your password. You can change defaults with:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
```
 | 
			
		||||
    environment:
 | 
			
		||||
      INITIAL_ADMIN_EMAIL: my@example.com
 | 
			
		||||
      INITIAL_ADMIN_PASSWORD: mypassword1
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
<td class="text-center">
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- owner.avatar || '/images/default-avatar.jpg' %>)" title="Owned by <%- owner.name %>">
 | 
			
		||||
        <span class="avatar-status <%- owner.is_disabled ? 'bg-red' : 'bg-green' %>"></span>
 | 
			
		||||
    <div class="avatar d-block" style="background-image: url(<%- (owner && owner.avatar) || '/images/default-avatar.jpg' %>)" title="Owned by <%- (owner && owner.name) || 'a deleted user' %>">
 | 
			
		||||
        <span class="avatar-status <%- owner && !owner.is_disabled ? 'bg-green' : 'bg-red' %>"></span>
 | 
			
		||||
    </div>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
		"credentials": "dns_acmedns_api_url = http://acmedns-server/\ndns_acmedns_registration_file = /data/acme-registration.json",
 | 
			
		||||
		"full_plugin_name": "dns-acmedns"
 | 
			
		||||
	},
 | 
			
		||||
    "active24":{
 | 
			
		||||
	"active24":{
 | 
			
		||||
		"name": "Active24",
 | 
			
		||||
		"package_name": "certbot-dns-active24",
 | 
			
		||||
		"version": "~=1.5.1",
 | 
			
		||||
@@ -194,7 +194,7 @@
 | 
			
		||||
	"freedns": {
 | 
			
		||||
		"name": "FreeDNS",
 | 
			
		||||
		"package_name": "certbot-dns-freedns",
 | 
			
		||||
		"version": "~=0.2.0",
 | 
			
		||||
		"version": "~=0.1.0",
 | 
			
		||||
		"dependencies": "",
 | 
			
		||||
		"credentials": "dns_freedns_username = myremoteuser\ndns_freedns_password = verysecureremoteuserpassword",
 | 
			
		||||
		"full_plugin_name": "dns-freedns"
 | 
			
		||||
@@ -303,6 +303,14 @@
 | 
			
		||||
		"credentials": "dns_joker_username = <Dynamic DNS Authentication Username>\ndns_joker_password = <Dynamic DNS Authentication Password>\ndns_joker_domain = <Dynamic DNS Domain>",
 | 
			
		||||
		"full_plugin_name": "dns-joker"
 | 
			
		||||
	},
 | 
			
		||||
	"leaseweb": {
 | 
			
		||||
		"name": "LeaseWeb",
 | 
			
		||||
		"package_name": "certbot-dns-leaseweb",
 | 
			
		||||
		"version": "~=1.0.1",
 | 
			
		||||
		"dependencies": "",
 | 
			
		||||
		"credentials": "dns_leaseweb_api_token = 01234556789",
 | 
			
		||||
		"full_plugin_name": "dns-leaseweb"
 | 
			
		||||
	},
 | 
			
		||||
	"linode": {
 | 
			
		||||
		"name": "Linode",
 | 
			
		||||
		"package_name": "certbot-dns-linode",
 | 
			
		||||
@@ -424,13 +432,13 @@
 | 
			
		||||
		"full_plugin_name": "dns-rfc2136"
 | 
			
		||||
	},
 | 
			
		||||
	"rockenstein": {
 | 
			
		||||
                "name": "rockenstein AG",
 | 
			
		||||
                "package_name": "certbot-dns-rockenstein",
 | 
			
		||||
                "version": "~=1.0.0",
 | 
			
		||||
                "dependencies": "",
 | 
			
		||||
                "credentials": "dns_rockenstein_token=<token>",
 | 
			
		||||
                "full_plugin_name": "dns-rockenstein"
 | 
			
		||||
        },
 | 
			
		||||
		"name": "rockenstein AG",
 | 
			
		||||
		"package_name": "certbot-dns-rockenstein",
 | 
			
		||||
		"version": "~=1.0.0",
 | 
			
		||||
		"dependencies": "",
 | 
			
		||||
		"credentials": "dns_rockenstein_token=<token>",
 | 
			
		||||
		"full_plugin_name": "dns-rockenstein"
 | 
			
		||||
	},
 | 
			
		||||
	"route53": {
 | 
			
		||||
		"name": "Route 53 (Amazon)",
 | 
			
		||||
		"package_name": "certbot-dns-route53",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user