Skip to content
Commit 57d4e9d0 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'patch-1' into 'stable-3.1'

copy install/tpl/apache_ispconfig.conf.master to server/conf/apache_ispconfig.conf.master

If you add/remove server IPs the file `/etc/apache2/sites-available/ispconfig.conf` gets recreated and it is missing the alias for Let's Encrypt ACME challenges. Copying over the current install template fixes that. 

Maybe one could remove this template duplication completely by using `server/conf/apache_ispconfig.conf.master` in the install process?

The `Header set Content-Type "text/plain"` was only in `server/conf/apache_ispconfig.conf.master` and not in `install/tpl/apache_ispconfig.conf.master` – is it necessary?

See merge request !463
parents d1195696 6910f4e7
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment