From 15c616799ec1d5e6016acdb20dd6669e6a97a820 Mon Sep 17 00:00:00 2001
From: DrMikeJS <40201576+DrMikeJS@users.noreply.github.com>
Date: Sat, 7 May 2022 20:24:31 +1200
Subject: [PATCH] Changes required to build working container for Docker on
WSL2 in Windows 10
Changed CRLF to LF in all files
Replaced shortcuts to flower.conf with contents of flower.conf
Replaced Deprecated Django url function with re_path aliased as url
Replaced NullBooleanField with BooleanField(null=True) for Django 4 compatibililty.
---
src/cytoscape.js | 2 +-
.../etc/apache2/conf-available/flower.conf | 34 ++++++++++++++++++-
.../etc/apache2/conf-enabled/flower.conf | 34 ++++++++++++++++++-
src/open-semantic-entity-search-api | 2 +-
src/open-semantic-etl | 2 +-
5 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/src/cytoscape.js b/src/cytoscape.js
index 6221bfc..56fdab6 160000
--- a/src/cytoscape.js
+++ b/src/cytoscape.js
@@ -1 +1 @@
-Subproject commit 6221bfcd0324148da19c0fa974317afa657fb616
+Subproject commit 56fdab645320b005c9f9f6fce84036641961b850
diff --git a/src/flower/etc/apache2/conf-available/flower.conf b/src/flower/etc/apache2/conf-available/flower.conf
index b9d87de..6f4c09f 120000
--- a/src/flower/etc/apache2/conf-available/flower.conf
+++ b/src/flower/etc/apache2/conf-available/flower.conf
@@ -1 +1,33 @@
-../../flower/apache.conf
\ No newline at end of file
+
+ Define FLOWER_URL http://localhost:5555/flower
+
+
+ProxyRequests off
+ProxyPass /flower ${FLOWER_URL}
+
+
+
+
+
+ AuthType Basic
+ AuthUserFile /etc/opensemanticsearch-django-webapps/.htpasswd
+ AuthName "Open Semantic Search"
+
+
+ Require valid-user
+
+
+
+
+
+ AuthType Basic
+ AuthUserFile /etc/solr-php-ui/.htpasswd
+ AuthName "Open Semantic Search"
+
+
+ Require valid-user
+
+
+
+
+
diff --git a/src/flower/etc/apache2/conf-enabled/flower.conf b/src/flower/etc/apache2/conf-enabled/flower.conf
index eb01dd7..6f4c09f 120000
--- a/src/flower/etc/apache2/conf-enabled/flower.conf
+++ b/src/flower/etc/apache2/conf-enabled/flower.conf
@@ -1 +1,33 @@
-../conf-available/flower.conf
\ No newline at end of file
+
+ Define FLOWER_URL http://localhost:5555/flower
+
+
+ProxyRequests off
+ProxyPass /flower ${FLOWER_URL}
+
+
+
+
+
+ AuthType Basic
+ AuthUserFile /etc/opensemanticsearch-django-webapps/.htpasswd
+ AuthName "Open Semantic Search"
+
+
+ Require valid-user
+
+
+
+
+
+ AuthType Basic
+ AuthUserFile /etc/solr-php-ui/.htpasswd
+ AuthName "Open Semantic Search"
+
+
+ Require valid-user
+
+
+
+
+
diff --git a/src/open-semantic-entity-search-api b/src/open-semantic-entity-search-api
index 8fceefc..2ae3957 160000
--- a/src/open-semantic-entity-search-api
+++ b/src/open-semantic-entity-search-api
@@ -1 +1 @@
-Subproject commit 8fceefc5f24980202f683f6f647c14f57a44bb81
+Subproject commit 2ae395770e4918758a4b07d6e699c7d7542eb208
diff --git a/src/open-semantic-etl b/src/open-semantic-etl
index e7e5acf..2fad7ce 160000
--- a/src/open-semantic-etl
+++ b/src/open-semantic-etl
@@ -1 +1 @@
-Subproject commit e7e5acf0fff10e0e4904c91e2beba5ffcfdb2dc7
+Subproject commit 2fad7ce92a30d488b906b144124c5e68944a400f