Commit 797962c3 authored by Gérard Huet's avatar Gérard Huet

Experimental 3.11 version with choice of protocols http/https

parent 76e35183
......@@ -740,8 +740,8 @@ value title_instructions =
;
value doctype = "<!DOCTYPE html>" (* Assuming HTML5 *)
;
value url dns = "http://" ^ dns;
value url dns = Paths.server_protocol ^ "://" ^ dns
;
value ocaml_site = url "ocaml.org"
and inria_site = url "www.inria.fr/"
and tomcat = url "localhost:8080/" (* Sanskrit Library runs Tomcat *)
......
......@@ -4154,6 +4154,8 @@ value pseudo_nominal_basis = fun
| [ 43; 1; 45; 1 ] (* avara *)
| [ 45; 43; 1; 48 ] (* sarva *)
| [ 45; 43; 6; 37 ] (* puurva Whitney§524 *)
(* NB ga.na {puurva, paraavara, dak.si.na, uttara, apara, adhara} -: paraavara
+: aneka, pazcima, nema, ubhaya, antara, para, avara, sarva, vizva, sva *)
| [ 45; 46; 3; 45 ] (* vizva *)
| [ 45; 48 ] (* sva *) -> True
| _ -> False
......
ZENDIR='/home/ambaji/SKT/Zen/ML'
PLATFORM='Station'
TRANSLIT='WX'
LEXICON='SH'
DISPLAY='deva'
SERVERHOST='127.0.0.1'
SERVERPROTOCOL='http'
SERVERPUBLICDIR='/var/www/html/SKT/# amba'
SKTDIRURL='/SKT/# amba'
SKTRESOURCES='/home/ambaji/SKT/Heritage_Resources/'
......
......@@ -4,6 +4,7 @@ TRANSLIT='VH'
LEXICON='SH'
DISPLAY='roma'
SERVERHOST='127.0.0.1'
SERVERPROTOCOL='http'
SERVERPUBLICDIR='/Library/WebServer/Documents/SKT/'
SKTDIRURL='/SKT/'
SKTRESOURCES='/Users/huet/Sanskrit/Heritage_Resources/'
......
......@@ -4,8 +4,9 @@ TRANSLIT='VH'
LEXICON='SH'
DISPLAY='roma'
SERVERHOST='sanskrit.inria.fr# sanskrit'
SERVERPROTOCOL='https'
SERVERPUBLICDIR='/var/www/sanskrit.rocq.inria.fr/'
SKTDIRURL='http://sanskrit.inria.fr/# sanskrit'
SKTDIRURL='https://sanskrit.inria.fr/# sanskrit'
SKTRESOURCES='/home/huet/Sanskrit/Heritage_Resources/'
CGIBINURL='/cgi-bin/SKT/# quincy/sanskrit compatible amrita'
CGIDIR='/var/www/cgi-bin/SKT/# sanskrit'
......
......@@ -103,6 +103,9 @@ SERVERHOST should be the domain name (or IP address) of the target HTTP server.
For instance, use SERVERHOST='127.0.0.1' for localhost service
(SERVERHOST='localhost' should work too).
SERVERPROTOCOL should be set to 'http' for a localhost or non secured server,
and to 'https' for a server with a security certificate.
SERVERPUBLICDIR should be the absolute path on the server file system of the data
to be used by its cgi-bin executables - it should be allowed as readable from
all. The fields of the configuration file relevant to the Apache server
......
......@@ -148,8 +148,11 @@ SERVERHOST=#SERVERHOST
# SERVERHOST=pauillac.inria.fr# pauillac
# SERVERHOST=213.41.153.152# dhruva gerardh.net1.nerim.net [legacy]
# Protocol used by the server (http or https)
SERVERPROTOCOL=#SERVERPROTOCOL
# For remote invocation of cgi services (eg Sanskrit Library)
REMOTESERVERHOST=http://sanskrit.inria.fr/# remote host Inria
REMOTESERVERHOST=https://sanskrit.inria.fr/# remote host Inria
# The SKT public http directory on the server
SERVERPUBLICDIR=#SERVERPUBLICDIR
......@@ -430,6 +433,7 @@ echo 'and skt_resources_dir = "$(SKTRESOURCES)"'; \
echo 'and public_skt_dir = "$(SERVERPUBLICDIR)"'; \
echo 'and skt_dir_url = "$(SKTDIRURL)"'; \
echo 'and server_host = "$(SERVERHOST)"'; \
echo 'and server_protocol = "$(SERVERPROTOCOL)"'; \
echo 'and remote_server_host = "$(REMOTESERVERHOST)"'; \
echo 'and cgi_dir_url = "$(CGIBINURL)"'; \
echo 'and cgi_index = "$(CGIINDEX)"'; \
......
......@@ -18,12 +18,15 @@ TRANSLIT='VH'
# Default lexicon: SH for Sanskrit Heritage (French), MW for Monier-Williams (English)
LEXICON='SH'
# Default display font : 'roma', 'deva'
# Default display font : 'roma' or 'deva'
DISPLAY='roma'
# URL of host server -- '127.0.0.1' for localhost
SERVERHOST='127.0.0.1'
# Protocol used by the host server: 'http' or 'https'
SERVERPROTOCOL='http'
# IMPORTANT: in SERVERPUBLICDIR as well as CGIDIR below, you must plan on
# creating the directories in the Apache area /var/www, in supervisor mode
......
VERSION='3.10'
DATE='2018-11-27'
VERSION='3.11'
DATE='2018-12-04'
......@@ -994,6 +994,7 @@ from Vojko (Ljubljana, Slovenia)</a><br>
<a href="http://samskrtaprasruti.wordpress.com/">Sanskrit Prasruti blog</a><br>
<a href="http://samskrtam.wordpress.com/">Sanskrit blog</a><br>
<a href="http://simplesanskrit.wordpress.com/">Simple Sanskrit Lessons by S.L. Abhyankar</a><br>
<a href="http://slabhyankar.wordpress.com/">Study Sanskrit blog by S. L. Abhyankar</a><br>
<a href="http://simplesanskrit.blogspot.fr">Simple Sanskrit blog of G.S.S. Murthy</a><br>
<a href="http://shastrapriyah.blogspot.com/">Shastapriyaa blog by Swami Neelakantha</a><br>
<a href="http://groups.google.com/group/gita-anvaya-sandhi-vigraha">gItA anvaya sandhi vigraha Google group</a><br>
......@@ -1002,7 +1003,6 @@ from Vojko (Ljubljana, Slovenia)</a><br>
<a href="http://sanskrit-paris.blogspot.com/">Samskrita bhasa of Nicole Edouard P&eacute;qu&eacute;riau</a><br>
<a href="http://learnsanskrit.wordpress.com/">Learn Sanskrit blog</a><br>
<a href="http://study1geetaa2sanskrit.wordpress.com/">Learning together Sanskrit and GeetA</a><br>
<a href="http://slabhyankar.wordpress.com/">Study Sanskrit blog by Slabhyankar</a><br>
<a href="http://parankusa.org">Parankusacar Institute of Vedic Studies</a><br>
<a href="http://sanskritaprasruti.wordpress.com/">Learning Sanskrit on-line</a><br>
<a href="http://54.221.214.133/sanskritfromhome/">Learn Sanskrit from home</a><br>
......
......@@ -22,8 +22,9 @@ goldendict_path="SITE/goldendict.html"
meta_docintro_path="DOC/docintro"
docintro_path="DOC/docintro.tex"
makefile_keys=["TEMPLATE","PLATFORM","TRANSLIT","LEXICON","DISPLAY","WARN",
"SERVERHOST","SERVERPUBLICDIR","SKTDIRURL","SKTRESOURCES",
"CGIBINURL","CGIDIR","CGIEXT","MOUSEACTION","ZENDIR"]
"SERVERHOST","SERVERPROTOCOL","SERVERPUBLICDIR","SKTDIRURL",
"SKTRESOURCES","CGIBINURL","CGIDIR","CGIEXT","MOUSEACTION",
"ZENDIR"]
# deprecated "SCLURL","SCLINSTALLDIR","TEMPAREA","OUTPUTFONT",
counter_keys=["CAPTION"]
version_keys=["VERSION","DATE"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment