- fixed wrong letsencrypt paths

Marius Burkard

2016-02-11 c2d5bc6ba51f013e102f98dfed444d5dd0c093fc

- fixed wrong letsencrypt paths

 install/tpl/apache_ispconfig.conf.master

@@ -118,8 +118,8 @@
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>

 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");
                }
            };