From 435ce38d6939087144c7b8d2764968312e839e24 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 8 Dec 2015 16:24:06 +0100
Subject: [PATCH] - Added some code for the letsencrypt merge
---
install/sql/incremental/upd_dev_collection.sql | 2 ++
install/sql/ispconfig3.sql | 1 +
server/conf/apache_ispconfig.conf.master | 7 +++++++
3 files changed, 10 insertions(+)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 81c64d9225..d9bca1625b 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/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
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index f5952fa801..77a12b4538 100644
--- a/install/sql/ispconfig3.sql
+++ b/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,
diff --git a/server/conf/apache_ispconfig.conf.master b/server/conf/apache_ispconfig.conf.master
index 6b2accbc8e..c965e3f11d 100644
--- a/server/conf/apache_ispconfig.conf.master
+++ b/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
--
GitLab