- Added some code for the letsencrypt merge

install/sql/incremental/upd_dev_collection.sql

@@ -187,3 +187,5 @@ ALTER TABLE openvz_template ADD COLUMN `custom` text;
 ALTER TABLE openvz_vm
   ADD COLUMN `bootorder` INT(11) NOT NULL DEFAULT '1' AFTER `start_boot`,
   ADD COLUMN `custom` text;
+
+ALTER TABLE `web_domain` ADD `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n';
\ No newline at end of file

install/sql/ispconfig3.sql

@@ -1903,6 +1903,7 @@ CREATE TABLE `web_domain` (
   `seo_redirect` varchar(255) default NULL,
   `rewrite_to_https` ENUM('y','n') NOT NULL DEFAULT 'n',
   `ssl` enum('n','y') NOT NULL default 'n',
+  `ssl_letsencrypt` enum('n','y') NOT NULL DEFAULT 'n',
   `ssl_state` varchar(255) NULL,
   `ssl_locality` varchar(255) NULL,
   `ssl_organisation` varchar(255) NULL,

server/conf/apache_ispconfig.conf.master

@@ -14,6 +14,13 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
 	Order Deny,Allow
 	Deny from all
 	</tmpl_if>
+
+ <IfModule mod_headers.c>
+    <LocationMatch "/.well-known/acme-challenge/*">
+      Header set Content-Type "text/plain"
+    </LocationMatch>
+  </IfModule>
+
 </Directory>
 
 # Do not allow access to the root file system of the server for security reasons