Commit bd50f79b authored by Gérard Huet's avatar Gérard Huet

Suppression of useless SERVERPROTOCOL config parameter

parent 18baa957
......@@ -739,7 +739,7 @@ value title_instructions =
;
value doctype = "<!DOCTYPE html>" (* Assuming HTML5 *)
;
value url dns = (* Paths.server_protocol *) "http://" ^ dns
value url dns = "http://" ^ dns
;
value ocaml_site = url "ocaml.org"
and inria_site = url "www.inria.fr/"
......
......@@ -4,7 +4,6 @@ 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,7 +4,6 @@ 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,7 +4,6 @@ TRANSLIT='VH'
LEXICON='SH'
DISPLAY='roma'
SERVERHOST='sanskrit.inria.fr# sanskrit'
SERVERPROTOCOL='https'
SERVERPUBLICDIR='/var/www/sanskrit.rocq.inria.fr/'
SKTDIRURL='https://sanskrit.inria.fr/# sanskrit'
SKTRESOURCES='/home/huet/Sanskrit/Heritage_Resources/'
......
......@@ -103,9 +103,6 @@ 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,9 +148,6 @@ 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=https://sanskrit.inria.fr/# remote host Inria
......@@ -433,7 +430,6 @@ 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)"'; \
......
......@@ -24,9 +24,6 @@ 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.12'
DATE='2019-01-15'
DATE='2019-01-17'
......@@ -22,10 +22,10 @@ goldendict_path="SITE/goldendict.html"
meta_docintro_path="DOC/docintro"
docintro_path="DOC/docintro.tex"
makefile_keys=["TEMPLATE","PLATFORM","TRANSLIT","LEXICON","DISPLAY","WARN",
"SERVERHOST","SERVERPROTOCOL","SERVERPUBLICDIR","SKTDIRURL",
"SERVERHOST","SERVERPUBLICDIR","SKTDIRURL",
"SKTRESOURCES","CGIBINURL","CGIDIR","CGIEXT","MOUSEACTION",
"ZENDIR"]
# deprecated "SCLURL","SCLINSTALLDIR","TEMPAREA","OUTPUTFONT",
# deprecated "SCLURL","SCLINSTALLDIR","TEMPAREA","OUTPUTFONT","SERVERPROTOCOL"
counter_keys=["CAPTION"]
version_keys=["VERSION","DATE"]
TEMPLATE='#'
......
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