Index: local/greenstone3/linux-64bit/README--debian10-to-greenstone3.txt
===================================================================
--- local/greenstone3/linux-64bit/README--debian10-to-greenstone3.txt (revision 34664)
+++ (revision )
@@ -1,105 +1,0 @@
-#----
-# Get verious development/compiler tools installed:
-#----
-
-sudo apt-get update
-sudo apt-get install subversion
-sudo apt-get install gcc g++
-sudo apt-get install build-essential
-sudo apt-get install ant
-sudo apt-get install openjdk-11-jdk
-
-# The Greenstone3 build process uses wget to download
-# additional components:
-
-sudo apt-get install wget
-
-# The following environment variables are key for compilation
-# They are often setup up in local/gs3-setup.sh
-
-export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-
-export CFLAGS=-fPIC
-#export CXXFLAGS=-fPIC
-export JAVACFLAGS="-source 1.6 -target 1.6"
-
-# Prepare to compile:
-
-ant
-ant prepare
-
-# Edit build.properties:
-
- checkout.imagemagick.ext=true
-
-# Edit build.xml to disable compiling wv-ware
-# (around line 719):
-
- value="${opt.gnomelibext.arg} "
-# =>
- value="${opt.gnomelibext.arg} --disable-wvware"
-
-
-
-
-# Found that gs2build wget compile needed static version of -lz
-# Did this by copying out the imagemagic zlib tarball, compiling i tup
-# and updating the gs2buid/build-src/packages/configure to include
-# -L/.../ in front of -lz
-
-#----
-# To get going with https with Apache web server
-#----
-
-sudo apt-get install apache2
-
-sudo apt install snapd
-sudo snap install core; sudo snap refresh core
-sudo snap install --classic certbot
-sudo ln -s /snap/bin/certbot /usr/bin/certbot
-
-sudo certbot --apache
-
-
-sudo a2enmod proxy_http
-sudo systemctl restart apache2
-
-#----
-
-#Interesting part of:
-# /etc/apache2/sites-enabled/000-default-le-ssl.conf
-
- ProxyPass /greenstone3 http://localhost:8383/greenstone3
- ProxyPassReverse /greenstone3 http://localhost:8383/greenstone3
-
-# ProxyPass /cambridge-museum http://localhost:9393/greenstone3
-# ProxyPassReverse /cambridge-museum http://localhost:9393/greenstone3
-#
-# ProxyPassReverseCookiePath /greenstone3 /cambridge-museum
-#
-
-
-ServerName so-we-must-think.space
-Include /etc/letsencrypt/options-ssl-apache.conf
-ServerAlias sowemustthink.space
-SSLCertificateFile /etc/letsencrypt/live/so-we-must-think.space/fullchain.pem
-SSLCertificateKeyFile /etc/letsencrypt/live/so-we-must-think.space/privkey.pem
-
-RewriteEngine on
-RewriteRule "^/$" "/greenstone3/library" [PT]
-
-#----
-
-# Edit:
-# build.properties
-
-tomcat.server=
-
-# Edit:
-# web/sites/localsite/siteConfig.xml
-
- ///greenstone3/
-
-ant restart
-
-
Index: local/greenstone3/linux-64bit/README--debian10-to-https-greenstone3.txt
===================================================================
--- local/greenstone3/linux-64bit/README--debian10-to-https-greenstone3.txt (revision 34665)
+++ local/greenstone3/linux-64bit/README--debian10-to-https-greenstone3.txt (revision 34665)
@@ -0,0 +1,105 @@
+#----
+# Get verious development/compiler tools installed:
+#----
+
+sudo apt-get update
+sudo apt-get install subversion
+sudo apt-get install gcc g++
+sudo apt-get install build-essential
+sudo apt-get install ant
+sudo apt-get install openjdk-11-jdk
+
+# The Greenstone3 build process uses wget to download
+# additional components:
+
+sudo apt-get install wget
+
+# The following environment variables are key for compilation
+# They are often setup up in local/gs3-setup.sh
+
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
+export CFLAGS=-fPIC
+#export CXXFLAGS=-fPIC
+export JAVACFLAGS="-source 1.6 -target 1.6"
+
+# Prepare to compile:
+
+ant
+ant prepare
+
+# Edit build.properties:
+
+ checkout.imagemagick.ext=true
+
+# Edit build.xml to disable compiling wv-ware
+# (around line 719):
+
+ value="${opt.gnomelibext.arg} "
+# =>
+ value="${opt.gnomelibext.arg} --disable-wvware"
+
+
+
+
+# Found that gs2build wget compile needed static version of -lz
+# Did this by copying out the imagemagic zlib tarball, compiling i tup
+# and updating the gs2buid/build-src/packages/configure to include
+# -L/.../ in front of -lz
+
+#----
+# To get going with https with Apache web server
+#----
+
+sudo apt-get install apache2
+
+sudo apt install snapd
+sudo snap install core; sudo snap refresh core
+sudo snap install --classic certbot
+sudo ln -s /snap/bin/certbot /usr/bin/certbot
+
+sudo certbot --apache
+
+
+sudo a2enmod proxy_http
+sudo systemctl restart apache2
+
+#----
+
+#Interesting part of:
+# /etc/apache2/sites-enabled/000-default-le-ssl.conf
+
+ ProxyPass /greenstone3 http://localhost:8383/greenstone3
+ ProxyPassReverse /greenstone3 http://localhost:8383/greenstone3
+
+# ProxyPass /cambridge-museum http://localhost:9393/greenstone3
+# ProxyPassReverse /cambridge-museum http://localhost:9393/greenstone3
+#
+# ProxyPassReverseCookiePath /greenstone3 /cambridge-museum
+#
+
+
+ServerName so-we-must-think.space
+Include /etc/letsencrypt/options-ssl-apache.conf
+ServerAlias sowemustthink.space
+SSLCertificateFile /etc/letsencrypt/live/so-we-must-think.space/fullchain.pem
+SSLCertificateKeyFile /etc/letsencrypt/live/so-we-must-think.space/privkey.pem
+
+RewriteEngine on
+RewriteRule "^/$" "/greenstone3/library" [PT]
+
+#----
+
+# Edit:
+# build.properties
+
+tomcat.server=
+
+# Edit:
+# web/sites/localsite/siteConfig.xml
+
+ ///greenstone3/
+
+ant restart
+
+