This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 5565915 Improved: Clean up demo site build scripts (OFBIZ-12863)
5565915 is described below
commit 556591524fd2a955feae2dea93028e1847f70d33
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Jan 14 10:39:29 2024 +0100
Improved: Clean up demo site build scripts (OFBIZ-12863)
Moves now useless files into Attic, this time also patches and site-enabled
config
---
demo-backup/Attic/patch/next/fop.xconf.patch | 11 +++++
demo-backup/Attic/patch/next/solr.config.patch | 55 ++++++++++++++++++++++
demo-backup/Attic/patch/next/url.properties.patch | 15 ++++++
demo-backup/Attic/patch/stable/fop.xconf.patch | 16 +++++++
demo-backup/Attic/patch/stable/solr.config.patch | 30 ++++++++++++
.../Attic/patch/stable/url.properties.patch | 15 ++++++
demo-backup/Attic/patch/trunk/fop.xconf.patch | 16 +++++++
demo-backup/Attic/patch/trunk/solr.config.patch | 54 +++++++++++++++++++++
demo-backup/Attic/patch/trunk/url.properties.patch | 16 +++++++
.../site-enabled3/10-ofbiz-vm-bigfiles-80.conf | 31 ++++++++++++
.../Attic/site-enabled3/12-ofbiz-old-vm3-80.conf | 28 +++++++++++
.../site-enabled3/12-ofbiz-stable-vm3-80.conf | 28 +++++++++++
.../Attic/site-enabled3/12-ofbiz-trunk-vm3-80.conf | 28 +++++++++++
demo-backup/Attic/site-enabled3/15-default.conf | 27 +++++++++++
.../Attic/site-enabled3/25-ofbiz-old-vm3-443.conf | 44 +++++++++++++++++
.../site-enabled3/25-ofbiz-stable-vm3-443.conf | 44 +++++++++++++++++
.../site-enabled3/25-ofbiz-trunk-vm3-443.conf | 44 +++++++++++++++++
.../site-enabled3/25-ofbiz-vm-bigfiles-443.conf | 33 +++++++++++++
18 files changed, 535 insertions(+)
diff --git a/demo-backup/Attic/patch/next/fop.xconf.patch
b/demo-backup/Attic/patch/next/fop.xconf.patch
new file mode 100644
index 0000000..2e1b90e
--- /dev/null
+++ b/demo-backup/Attic/patch/next/fop.xconf.patch
@@ -0,0 +1,11 @@
+--- framework/webapp/config/fop.xconf
++++ framework/webapp/config/fop.xconf
+@@ -32,7 +32,7 @@ the location of this file.
+
+ <!-- Base URL for resolving relative URLs -->
+ <!-- We have to keep HTTP URL , FOP does not support HTTPS baseUrl for
external graphics due to certificate issue (not remember exact reason) -->
+- <base>http://localhost:8080</base>
++ <base>https://demo-next.ofbiz.apache.org</base>
+
+ <!-- Source resolution in dpi (dots/pixels per inch) for determining the
size of pixels in SVG and bitmap images, default: 72dpi -->
+ <source-resolution>72</source-resolution>
diff --git a/demo-backup/Attic/patch/next/solr.config.patch
b/demo-backup/Attic/patch/next/solr.config.patch
new file mode 100644
index 0000000..1b4dd67
--- /dev/null
+++ b/demo-backup/Attic/patch/next/solr.config.patch
@@ -0,0 +1,55 @@
+diff --git solr/config/solrconfig.properties solr/config/solrconfig.properties
+index b87a305..b87142b 100644
+--- solr/config/solrconfig.properties
++++ solr/config/solrconfig.properties
+@@ -25,6 +25,10 @@ solr.webapp.domainName=localhost
+ solr.webapp.portOverride=
+ solr.webapp.path=/solr
+
++# complete url with protocol, domainName,port(if require), and webapp path
++# complete url will be given preference if set
++solr.complete.url=https://demo-next.ofbiz.apache.org/solr
++
+ # Global solr ECA service toggling
+ # Set to true to enable solr indexing using ECAs/SECAs.
+ # If set to false, solr services meant to be triggered by ECA/SECA will not
execute and will "succeed" silently.
+diff --git solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+index 3e05b70..50c8bad 100644
+--- solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
++++ solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+@@ -32,11 +32,6 @@ import org.apache.http.client.methods.HttpGet;
+ import org.apache.http.client.protocol.HttpClientContext;
+ import org.apache.http.impl.client.CloseableHttpClient;
+ import org.apache.http.impl.client.HttpClients;
+-import org.apache.solr.client.solrj.SolrQuery;
+-import org.apache.solr.client.solrj.SolrRequest.METHOD;
+-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+-import org.apache.solr.client.solrj.response.QueryResponse;
+-import org.apache.solr.common.SolrInputDocument;
+ import org.apache.ofbiz.base.component.ComponentConfig;
+ import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
+ import org.apache.ofbiz.base.component.ComponentException;
+@@ -46,6 +41,11 @@ import org.apache.ofbiz.base.util.UtilHttp;
+ import org.apache.ofbiz.base.util.UtilProperties;
+ import org.apache.ofbiz.base.util.UtilValidate;
+ import org.apache.ofbiz.entity.GenericEntityException;
++import org.apache.solr.client.solrj.SolrQuery;
++import org.apache.solr.client.solrj.SolrRequest.METHOD;
++import org.apache.solr.client.solrj.impl.HttpSolrClient;
++import org.apache.solr.client.solrj.response.QueryResponse;
++import org.apache.solr.common.SolrInputDocument;
+
+ /**
+ * Solr utility class.
+@@ -78,6 +78,11 @@ public final class SolrUtil {
+ private static final boolean TRUST_SELF_SIGNED_CERT =
getTrustSelfSignedCert();
+
+ public static String makeSolrWebappUrl() {
++ final String solrCompleteUrl =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.complete.url");
++ if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
++ return solrCompleteUrl;
++ }
++
+ final String solrWebappProtocol =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.protocol");
+ final String solrWebappDomainName =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.domainName");
+ final String solrWebappPath =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.path");
diff --git a/demo-backup/Attic/patch/next/url.properties.patch
b/demo-backup/Attic/patch/next/url.properties.patch
new file mode 100644
index 0000000..05004fb
--- /dev/null
+++ b/demo-backup/Attic/patch/next/url.properties.patch
@@ -0,0 +1,15 @@
+Index: framework/webapp/config/url.properties
+===================================================================
+--- framework/webapp/config/url.properties (revision 1854638)
++++ framework/webapp/config/url.properties (working copy)
+@@ -36,8 +36,8 @@
+
+ # Static Content URLs to make it easy to move the serving load for static
content to other machines
+ # -- these are for general content such as images, js & css files, or
non-dynamic HTML files
+-content.url.prefix.secure=
+-content.url.prefix.standard=
++content.url.prefix.secure=https://demo-next.ofbiz.apache.org
++content.url.prefix.standard=https://demo-next.ofbiz.apache.org
+
+ # Here you can set the domain string to use for new cookies
+ cookie.domain=
diff --git a/demo-backup/Attic/patch/stable/fop.xconf.patch
b/demo-backup/Attic/patch/stable/fop.xconf.patch
new file mode 100644
index 0000000..1eebe5b
--- /dev/null
+++ b/demo-backup/Attic/patch/stable/fop.xconf.patch
@@ -0,0 +1,16 @@
+ framework/webapp/config/fop.xconf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git framework/webapp/config/fop.xconf framework/webapp/config/fop.xconf
+index 27576e37a5..36cdaa57c2 100644
+--- framework/webapp/config/fop.xconf
++++ framework/webapp/config/fop.xconf
+@@ -32,7 +32,7 @@ the location of this file.
+
+ <!-- Base URL for resolving relative URLs -->
+ <!-- We have to keep HTTP URL , FOP does not support HTTPS baseUrl for
external graphics due to certificate issue (not remember exact reason) -->
+- <base>http://localhost:8080</base>
++ <base>https://demo-stable.ofbiz.apache.org</base>
+
+ <!-- Source resolution in dpi (dots/pixels per inch) for determining the
size of pixels in SVG and bitmap images, default: 72dpi -->
+ <source-resolution>72</source-resolution>
diff --git a/demo-backup/Attic/patch/stable/solr.config.patch
b/demo-backup/Attic/patch/stable/solr.config.patch
new file mode 100644
index 0000000..dcd3d3d
--- /dev/null
+++ b/demo-backup/Attic/patch/stable/solr.config.patch
@@ -0,0 +1,30 @@
+diff --git solr/config/solrconfig.properties solr/config/solrconfig.properties
+index b87a305..b87142b 100644
+--- solr/config/solrconfig.properties
++++ solr/config/solrconfig.properties
+@@ -25,6 +25,10 @@ solr.webapp.domainName=localhost
+ solr.webapp.portOverride=
+ solr.webapp.path=/solr
+
++# complete url with protocol, domainName,port(if require), and webapp path
++# complete url will be given preference if set
++solr.complete.url=https://demo-stable.ofbiz.apache.org/solr
++
+ # Global solr ECA service toggling
+ # Set to true to enable solr indexing using ECAs/SECAs.
+ # If set to false, solr services meant to be triggered by ECA/SECA will not
execute and will "succeed" silently.
+diff --git solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+index 3e05b70..50c8bad 100644
+--- solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
++++ solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+@@ -76,6 +76,10 @@ public final class SolrUtil {
+ private static final boolean trustSelfSignedCert =
getTrustSelfSignedCert();
+
+ public static String makeSolrWebappUrl() {
++ final String solrCompleteUrl =
UtilProperties.getPropertyValue(solrConfigName, "solr.complete.url");
++ if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
++ return solrCompleteUrl;
++ }
+ final String solrWebappProtocol =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.protocol");
+ final String solrWebappDomainName =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.domainName");
+ final String solrWebappPath =
UtilProperties.getPropertyValue(solrConfigName, "solr.webapp.path");
diff --git a/demo-backup/Attic/patch/stable/url.properties.patch
b/demo-backup/Attic/patch/stable/url.properties.patch
new file mode 100644
index 0000000..a047be0
--- /dev/null
+++ b/demo-backup/Attic/patch/stable/url.properties.patch
@@ -0,0 +1,15 @@
+Index: framework/webapp/config/url.properties
+===================================================================
+--- framework/webapp/config/url.properties (revision 1854638)
++++ framework/webapp/config/url.properties (working copy)
+@@ -36,8 +36,8 @@
+
+ # Static Content URLs to make it easy to move the serving load for static
content to other machines
+ # -- these are for general content such as images, js & css files, or
non-dynamic HTML files
+-content.url.prefix.secure=
+-content.url.prefix.standard=
++content.url.prefix.secure=https://demo-stable.ofbiz.apache.org
++content.url.prefix.standard=https://demo-stable.ofbiz.apache.org
+
+ # Here you can set the domain string to use for new cookies
+ cookie.domain=
diff --git a/demo-backup/Attic/patch/trunk/fop.xconf.patch
b/demo-backup/Attic/patch/trunk/fop.xconf.patch
new file mode 100644
index 0000000..916b7b6
--- /dev/null
+++ b/demo-backup/Attic/patch/trunk/fop.xconf.patch
@@ -0,0 +1,16 @@
+ framework/webapp/config/fop.xconf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git framework/webapp/config/fop.xconf framework/webapp/config/fop.xconf
+index 27576e37a5..df21bf75b2 100644
+--- framework/webapp/config/fop.xconf
++++ framework/webapp/config/fop.xconf
+@@ -32,7 +32,7 @@ the location of this file.
+
+ <!-- Base URL for resolving relative URLs -->
+ <!-- We have to keep HTTP URL , FOP does not support HTTPS baseUrl for
external graphics due to certificate issue (not remember exact reason) -->
+- <base>http://localhost:8080</base>
++ <base>https://demo-trunk.ofbiz.apache.org</base>
+
+ <!-- Source resolution in dpi (dots/pixels per inch) for determining the
size of pixels in SVG and bitmap images, default: 72dpi -->
+ <source-resolution>72</source-resolution>
diff --git a/demo-backup/Attic/patch/trunk/solr.config.patch
b/demo-backup/Attic/patch/trunk/solr.config.patch
new file mode 100644
index 0000000..81fb98d
--- /dev/null
+++ b/demo-backup/Attic/patch/trunk/solr.config.patch
@@ -0,0 +1,54 @@
+diff --git solr/config/solrconfig.properties solr/config/solrconfig.properties
+index b87a305..b87142b 100644
+--- solr/config/solrconfig.properties
++++ solr/config/solrconfig.properties
+@@ -25,6 +25,10 @@ solr.webapp.domainName=localhost
+ solr.webapp.portOverride=
+ solr.webapp.path=/solr
+
++# complete url with protocol, domainName,port(if require), and webapp path
++# complete url will be given preference if set
++solr.complete.url=https://demo-trunk.ofbiz.apache.org/solr
++
+ # Global solr ECA service toggling
+ # Set to true to enable solr indexing using ECAs/SECAs.
+ # If set to false, solr services meant to be triggered by ECA/SECA will not
execute and will "succeed" silently.
+diff --git solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+index 4c0d2345..b216a6d1 100644
+--- solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
++++ solr/src/main/java/org/apache/ofbiz/solr/SolrUtil.java
+@@ -32,11 +32,6 @@ import org.apache.http.client.methods.HttpGet;
+ import org.apache.http.client.protocol.HttpClientContext;
+ import org.apache.http.impl.client.CloseableHttpClient;
+ import org.apache.http.impl.client.HttpClients;
+-import org.apache.solr.client.solrj.SolrQuery;
+-import org.apache.solr.client.solrj.SolrRequest.METHOD;
+-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+-import org.apache.solr.client.solrj.response.QueryResponse;
+-import org.apache.solr.common.SolrInputDocument;
+ import org.apache.ofbiz.base.component.ComponentConfig;
+ import org.apache.ofbiz.base.component.ComponentConfig.WebappInfo;
+ import org.apache.ofbiz.base.component.ComponentException;
+@@ -46,6 +41,11 @@ import org.apache.ofbiz.base.util.UtilHttp;
+ import org.apache.ofbiz.base.util.UtilProperties;
+ import org.apache.ofbiz.base.util.UtilValidate;
+ import org.apache.ofbiz.entity.GenericEntityException;
++import org.apache.solr.client.solrj.SolrQuery;
++import org.apache.solr.client.solrj.SolrRequest.METHOD;
++import org.apache.solr.client.solrj.impl.HttpSolrClient;
++import org.apache.solr.client.solrj.response.QueryResponse;
++import org.apache.solr.common.SolrInputDocument;
+
+ /**
+ * Solr utility class.
+@@ -78,6 +78,10 @@ public final class SolrUtil {
+ private static final boolean TRUST_SELF_SIGNED_CERT =
getTrustSelfSignedCert();
+
+ public static String makeSolrWebappUrl() {
++ final String solrCompleteUrl =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.complete.url");
++ if (UtilValidate.isNotEmpty(solrCompleteUrl)) {
++ return solrCompleteUrl;
++ }
+ final String solrWebappProtocol =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.protocol");
+ final String solrWebappDomainName =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.domainName");
+ final String solrWebappPath =
UtilProperties.getPropertyValue(SOLR_CONFIG_NAME, "solr.webapp.path");
diff --git a/demo-backup/Attic/patch/trunk/url.properties.patch
b/demo-backup/Attic/patch/trunk/url.properties.patch
new file mode 100644
index 0000000..0297000
--- /dev/null
+++ b/demo-backup/Attic/patch/trunk/url.properties.patch
@@ -0,0 +1,16 @@
+Index: framework/webapp/config/url.properties
+===================================================================
+--- framework/webapp/config/url.properties (revision 1854638)
++++ framework/webapp/config/url.properties (working copy)
+@@ -36,8 +36,8 @@
+
+ # Static Content URLs to make it easy to move the serving load for static
content to other machines
+ # -- these are for general content such as images, js & css files, or
non-dynamic HTML files
+-content.url.prefix.secure=
+-content.url.prefix.standard=
++content.url.prefix.secure=https://demo-trunk.ofbiz.apache.org
++content.url.prefix.standard=https://demo-trunk.ofbiz.apache.org
+
+ # Here you can set the domain string to use for new cookies
+ cookie.domain=
+
diff --git a/demo-backup/Attic/site-enabled3/10-ofbiz-vm-bigfiles-80.conf
b/demo-backup/Attic/site-enabled3/10-ofbiz-vm-bigfiles-80.conf
new file mode 100644
index 0000000..a86b1ae
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/10-ofbiz-vm-bigfiles-80.conf
@@ -0,0 +1,31 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:80>
+ ServerName ofbiz-vm3.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-bigfiles_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/ofbiz-vm-bigfiles-80_access.log" combined
+
+ ## Server aliases
+ ServerAlias ofbiz-bigfiles.apache.org
+
+ ## Custom fragment
+ RedirectMatch permanent ^/(.*)$ https://ofbiz-vm3.apache.org/$1
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/12-ofbiz-old-vm3-80.conf
b/demo-backup/Attic/site-enabled3/12-ofbiz-old-vm3-80.conf
new file mode 100644
index 0000000..af19709
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/12-ofbiz-old-vm3-80.conf
@@ -0,0 +1,28 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:80>
+ ServerName demo-old.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-old_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/demo-old.ofbiz.apache.org.http_access.log"
combined
+
+ ## Custom fragment
+ RedirectMatch permanent ^/(.*)$ https://demo-old.ofbiz.apache.org/$1
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/12-ofbiz-stable-vm3-80.conf
b/demo-backup/Attic/site-enabled3/12-ofbiz-stable-vm3-80.conf
new file mode 100644
index 0000000..50ae47a
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/12-ofbiz-stable-vm3-80.conf
@@ -0,0 +1,28 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:80>
+ ServerName demo-stable.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-stable_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/demo-stable.ofbiz.apache.org.http_access.log"
combined
+
+ ## Custom fragment
+ RedirectMatch permanent ^/(.*)$ https://demo-stable.ofbiz.apache.org/$1
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/12-ofbiz-trunk-vm3-80.conf
b/demo-backup/Attic/site-enabled3/12-ofbiz-trunk-vm3-80.conf
new file mode 100644
index 0000000..bde55e4
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/12-ofbiz-trunk-vm3-80.conf
@@ -0,0 +1,28 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:80>
+ ServerName demo-trunk.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-trunk_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/demo-trunk.ofbiz.apache.org.http_access.log"
combined
+
+ ## Custom fragment
+ RedirectMatch permanent ^/(.*)$ https://demo-trunk.ofbiz.apache.org/$1
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/15-default.conf
b/demo-backup/Attic/site-enabled3/15-default.conf
new file mode 100644
index 0000000..4b7fa8a
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/15-default.conf
@@ -0,0 +1,27 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:80>
+ ServerName default
+ ServerAdmin root@localhost
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/html"
+
+ ## Directories, there should at least be a declaration for /var/www/html
+
+ <Directory "/var/www/html">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/default_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/access.log" combined
+ ## Script alias directives
+ ScriptAlias /cgi-bin "/usr/lib/cgi-bin"
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/25-ofbiz-old-vm3-443.conf
b/demo-backup/Attic/site-enabled3/25-ofbiz-old-vm3-443.conf
new file mode 100644
index 0000000..4664fbd
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/25-ofbiz-old-vm3-443.conf
@@ -0,0 +1,44 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:443>
+ ServerName demo-old.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-ssl-old_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/ofbiz-ssl-old.apache.org.http_access.log"
combined
+
+ ## SSL directives
+ SSLEngine on
+ SSLCertificateFile "/etc/letsencrypt/live/ofbiz-vm3.apache.org/cert.pem"
+ SSLCertificateKeyFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/privkey.pem"
+ SSLCertificateChainFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/chain.pem"
+
+ ## Custom fragment
+ ProxyRequests Off
+ProxyPreserveHost On
+# do not proxy letsencrypt cert renewal requests
+ProxyPass /.well-known !
+ProxyPass / ajp://localhost:28009/
+ProxyPassReverse / ajp://localhost:28009/
+Header set Access-Control-Allow-Origin "https://localhost:28009";
+Header set Access-Control-Allow-Headers "Authorization"
+Header set Access-Control-Allow-Credentials "true"
+ProxyErrorOverride On
+ErrorDocument 503 https://ofbiz-vm3.apache.org/errorPage/503.html
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/25-ofbiz-stable-vm3-443.conf
b/demo-backup/Attic/site-enabled3/25-ofbiz-stable-vm3-443.conf
new file mode 100644
index 0000000..75a3e4e
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/25-ofbiz-stable-vm3-443.conf
@@ -0,0 +1,44 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:443>
+ ServerName demo-stable.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-ssl-stable_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/ofbiz-ssl-stable.apache.org.http_access.log"
combined
+
+ ## SSL directives
+ SSLEngine on
+ SSLCertificateFile "/etc/letsencrypt/live/ofbiz-vm3.apache.org/cert.pem"
+ SSLCertificateKeyFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/privkey.pem"
+ SSLCertificateChainFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/chain.pem"
+
+ ## Custom fragment
+ ProxyRequests Off
+ProxyPreserveHost On
+# do not proxy letsencrypt cert renewal requests
+ProxyPass /.well-known !
+ProxyPass / ajp://localhost:18009/
+ProxyPassReverse / ajp://localhost:18009/
+Header set Access-Control-Allow-Origin "https://localhost:18009";
+Header set Access-Control-Allow-Headers "Authorization"
+Header set Access-Control-Allow-Credentials "true"
+ProxyErrorOverride On
+ErrorDocument 503 https://ofbiz-vm3.apache.org/errorPage/503.html
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/25-ofbiz-trunk-vm3-443.conf
b/demo-backup/Attic/site-enabled3/25-ofbiz-trunk-vm3-443.conf
new file mode 100644
index 0000000..c3dbd2f
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/25-ofbiz-trunk-vm3-443.conf
@@ -0,0 +1,44 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:443>
+ ServerName demo-trunk.ofbiz.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-ssl-trunk_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/ofbiz-ssl-trunk.apache.org.http_access.log"
combined
+
+ ## SSL directives
+ SSLEngine on
+ SSLCertificateFile "/etc/letsencrypt/live/ofbiz-vm3.apache.org/cert.pem"
+ SSLCertificateKeyFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/privkey.pem"
+ SSLCertificateChainFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/chain.pem"
+
+ ## Custom fragment
+ ProxyRequests Off
+ProxyPreserveHost On
+# do not proxy letsencrypt cert renewal requests
+ProxyPass /.well-known !
+ProxyPass / ajp://localhost:8009/
+ProxyPassReverse / ajp://localhost:8009/
+Header set Access-Control-Allow-Origin "https://localhost:8443";
+Header set Access-Control-Allow-Headers "Authorization"
+Header set Access-Control-Allow-Credentials "true"
+ProxyErrorOverride On
+ErrorDocument 503 https://ofbiz-vm3.apache.org/errorPage/503.html
+
+</VirtualHost>
diff --git a/demo-backup/Attic/site-enabled3/25-ofbiz-vm-bigfiles-443.conf
b/demo-backup/Attic/site-enabled3/25-ofbiz-vm-bigfiles-443.conf
new file mode 100644
index 0000000..296909f
--- /dev/null
+++ b/demo-backup/Attic/site-enabled3/25-ofbiz-vm-bigfiles-443.conf
@@ -0,0 +1,33 @@
+# ************************************
+# Vhost template in module puppetlabs-apache
+# Managed by Puppet
+# ************************************
+#
+<VirtualHost *:443>
+ ServerName ofbiz-vm3.apache.org
+
+ ## Vhost docroot
+ DocumentRoot "/var/www/ofbiz/big-files"
+
+ ## Directories, there should at least be a declaration for
/var/www/ofbiz/big-files
+
+ <Directory "/var/www/ofbiz/big-files">
+ Options Indexes FollowSymLinks MultiViews
+ AllowOverride None
+ Require all granted
+ </Directory>
+
+ ## Logging
+ ErrorLog "/var/log/apache2/ofbiz-ssl-bigfiles_error.log"
+ ServerSignature Off
+ CustomLog "/var/log/apache2/ofbiz-ssl-bigfiles.apache.org.http_access.log"
combined
+
+ ## Server aliases
+ ServerAlias ofbiz-bigfiles.apache.org
+
+ ## SSL directives
+ SSLEngine on
+ SSLCertificateFile "/etc/letsencrypt/live/ofbiz-vm3.apache.org/cert.pem"
+ SSLCertificateKeyFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/privkey.pem"
+ SSLCertificateChainFile
"/etc/letsencrypt/live/ofbiz-vm3.apache.org/chain.pem"
+</VirtualHost>
