gitlabFork/ISPConfig3.git - Solinfo Gitblit

parent: 0e8c9aee | patch | commit | show whitespace

Marius Burkard

2016-02-11 486e424dfd1c57c4b4fef5c01319aca6d53cd7cf

Merge branch 'stable-3.1'

1 files renamed

4 files modified

	install/tpl/apache_ispconfig.conf.master	7 ●●●●● patch \| view \| raw \| blame \| history
	interface/acme/.well-known/acme-challenge/empty.dir	patch \| view \| raw \| blame \| history
	server/conf/nginx_vhost.conf.master	2 ●●●●● patch \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	2 ●●●●● patch \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	2 ●●●●● patch \| view \| raw \| blame \| history

 install/tpl/apache_ispconfig.conf.master

@@ -118,14 +118,17 @@
Alias /awstats-icon "/usr/share/awstats/icon"
</tmpl_if>

Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
<Directory /usr/local/ispconfig/interface/acme-challenge>
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
        <tmpl_if name='apache_version' op='>' value='2.2' format='version'>
        Require all granted
        <tmpl_else>
        Order allow,deny
        Allow from all
        </tmpl_if>
        RewriteEngine on
        RewriteCond %{REQUEST_FILENAME} ^/\.well-known/acme-challenge
        RewriteRule ^.*$ - [END]
</Directory>

NameVirtualHost *:80

 interface/acme/.well-known/acme-challenge/empty.dir


 server/conf/nginx_vhost.conf.master

@@ -264,7 +264,7 @@
</tmpl_if>

location /\.well-known/acme-challenge {
       root /usr/local/ispconfig/interface/acme-challenge;
       root /usr/local/ispconfig/interface/acme/.well-known/acme-challenge;
       index index.html index.htm;
       try_files $uri =404;
}

 server/plugins-available/apache2_plugin.inc.php

@@ -1184,7 +1184,7 @@
                $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);

                if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
                    $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme-challenge");
                    $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
                }
            };


 server/plugins-available/nginx_plugin.inc.php

@@ -1304,7 +1304,7 @@
                $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);

                if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
                    $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme-challenge");
                    $this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
                }
            };

			@@ -118,14 +118,17 @@
			Alias /awstats-icon "/usr/share/awstats/icon"
			</tmpl_if>

			Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme-challenge
			<Directory /usr/local/ispconfig/interface/acme-challenge>
			Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
			<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
			<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
			Require all granted
			<tmpl_else>
			Order allow,deny
			Allow from all
			</tmpl_if>
			RewriteEngine on
			RewriteCond %{REQUEST_FILENAME} ^/\.well-known/acme-challenge
			RewriteRule ^.*$ - [END]
			</Directory>

			NameVirtualHost *:80

			@@ -264,7 +264,7 @@
			</tmpl_if>

			location /\.well-known/acme-challenge {
			root /usr/local/ispconfig/interface/acme-challenge;
			root /usr/local/ispconfig/interface/acme/.well-known/acme-challenge;
			index index.html index.htm;
			try_files $uri =404;
			}

			@@ -1184,7 +1184,7 @@
			$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);

			if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
			$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme-challenge");
			$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
			}
			};

			@@ -1304,7 +1304,7 @@
			$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);

			if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
			$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme-challenge");
			$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
			}
			};