File 5432-ssl-Correct-example-in-PR-7079.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 5432-ssl-Correct-example-in-PR-7079.patch of Package erlang (Revision b3a22b16b9b462356a1a0d804f54fae1)

Currently displaying revision b3a22b16b9b462356a1a0d804f54fae1 , Show latest

From abcf5ffed176ead2ccf8ab651f50bdb65f6bfabb Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 5 Apr 2023 10:38:21 +0200
Subject: [PATCH] ssl: Correct example in PR 7079

---
 lib/inets/examples/server_root/Makefile       |  1 -
 lib/inets/examples/server_root/conf/8888.conf | 51 -------------------
 .../examples/server_root/conf/httpd.conf      | 12 ++---
 lib/inets/examples/server_root/conf/ssl.conf  |  9 ++--
 4 files changed, 9 insertions(+), 64 deletions(-)
 delete mode 100644 lib/inets/examples/server_root/conf/8888.conf

diff --git a/lib/inets/examples/server_root/Makefile b/lib/inets/examples/server_root/Makefile
index 5dfb8d1704..ad8a4758eb 100644
--- a/lib/inets/examples/server_root/Makefile
+++ b/lib/inets/examples/server_root/Makefile
@@ -41,7 +41,6 @@ AUTH_FILES = auth/group \
 	auth/passwd 
 CGI_FILES = cgi-bin/printenv.sh 
 CONF_FILES = conf/8080.conf \
-	conf/8888.conf \
 	conf/httpd.conf \
 	conf/ssl.conf \
 	conf/mime.types 
diff --git a/lib/inets/examples/server_root/conf/8888.conf b/lib/inets/examples/server_root/conf/8888.conf
deleted file mode 100644
index be2555a8b7..0000000000
--- a/lib/inets/examples/server_root/conf/8888.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-[{port, 8888},
- {server_name, "your.server.net"},
- {socket_type, ip_comm}
- {modules, [mod_alias,mod_auth,mod_esi,mod_actions,mod_cgi,mod_dir,mod_get,
-            mod_head,mod_log,mod_disk_log]},
- {server_admin, "jocke@erix.ericsson.se"},
- {server_root, "/var/tmp/server_root"},
- {error_log, "logs/error_log_8888"},
- {transfer_log, "logs/access_log_8888"},
- {error_disk_log, "logs/error_disk_log_8888"},
- {error_disk_log_size, {200000,10}},
- {transfer_disk_log, "logs/access_disk_log_8888"},
- {transfer_disk_log_size, {200000,10}},
- {max_clients, 150},
- {document_root, "/var/tmp/server_root/htdocs"},
- {directory_index, ["index.html", "welcome.html"]},
- {default_type, "text/plain"},
- {alias, {"/icons/", "/var/tmp/server_root/icons/"}},
- {alias, {"/pics/", "/var/tmp/server_root/icons/"}},
- {script_alias, {"/cgi-bin/", "/var/tmp/server_root/cgi-bin/"}},
- {script_alias, {"/htbin/", "/var/tmp/server_root/cgi-bin/"}},
- {erl_script_alias, {"/cgi-bin/erl", [httpd_example]}},
- % {script, {"HEAD", "/cgi-bin/printenv.sh"}},
- % {action, {"image/gif", "/cgi-bin/printenv.sh"}},
- {directory, {"/var/tmp/server_root/htdocs/open",
-              [{require,["user","one","Aladdin"]},
-               {auth_group_file,"/var/tmp/server_root/auth/group"},
-               {auth_user_file,"/var/tmp/server_root/auth/passwd"},
-               {auth_name,"Open Area"}]}},
- {directory, {"/var/tmp/server_root/htdocs/secret",
-              [{require,["group","group1","group2"]},
-               {auth_group_file,"/var/tmp/server_root/auth/group"},
-               {auth_user_file,"/var/tmp/server_root/auth/passwd"},
-               {auth_name,"Secret Area"}]}},
- {directory, {"/var/tmp/server_root/htdocs/secret/top_secret",
-              [{require,["group","group3"]},
-               {auth_group_file,"/var/tmp/server_root/auth/group"},
-               {auth_user_file,"/var/tmp/server_root/auth/passwd"},
-               {auth_name,"Top Secret Area"}]}},
- {directory, {"/var/tmp/server_root/htdocs/mnesia_open",
-              [{require,["user","one","Aladdin"]},
-               {auth_mnesia_d_b,"On"},
-               {auth_name,"Open Area"}]}},
- {directory, {"/var/tmp/server_root/htdocs/mnesia_secret",
-              [{require,["group","group1","group2"]},
-               {auth_mnesia_d_b,"On"},
-               {auth_name,"Secret Area"}]}},
- {directory, {"/var/tmp/server_root/htdocs/mnesia_secret/top_secret",
-              [{require,["group","group3"]},
-               {auth_mnesia_d_b,"On"},
-               {auth_name,"Top Secret Area"}]}}].
diff --git a/lib/inets/examples/server_root/conf/httpd.conf b/lib/inets/examples/server_root/conf/httpd.conf
index a56bf5133f..62043b5aa1 100644
--- a/lib/inets/examples/server_root/conf/httpd.conf
+++ b/lib/inets/examples/server_root/conf/httpd.conf
@@ -58,6 +58,12 @@
 
 {socket_type, ip_comm},
 
+%% Point certfile to a PEM encoded certificate. If the key is not combined
+%% with the certificate, use keyfile directive to point to the key file.
+%{socket_type, {ssl, [{certfile, "/var/tmp/server_root/ssl/ssl_server.pem"},
+%		      {keyfile, "/var/tmp/server_root/ssl/ssl_server.pem"},
+%		      {verify, verify_none}]}},
+
 %% Modules: Server run-time plug-in modules written using the Erlang
 %% Web Server API (EWSAPI). The server API make it easy to add functionality
 %% to the server. Read more about EWSAPI in the Reference Manual.
@@ -190,12 +196,6 @@
 
 {erl_script_alias, {"/down/erl", [httpd_example]}},
 
-%% Point certfile to a PEM encoded certificate. If the key is not combined
-%% with the certificate, use keyfile directive to point to the key file.
-{ssl, [{certfile, "/var/tmp/server_root/ssl/ssl_server.pem"},
-       {keyfile, "/var/tmp/server_root/ssl/ssl_server.pem"},
-       {verify, verify_none}]},
-
 %% Each directory to which INETS has access, can be configured with respect
 %% to which services and features are allowed and/or disabled in that
 %% directory (and its subdirectories). 
diff --git a/lib/inets/examples/server_root/conf/ssl.conf b/lib/inets/examples/server_root/conf/ssl.conf
index 33ef749cf6..85c8770530 100644
--- a/lib/inets/examples/server_root/conf/ssl.conf
+++ b/lib/inets/examples/server_root/conf/ssl.conf
@@ -1,6 +1,5 @@
 [{port, 8088},
  {server_name, "your.server.net"},
- {socket_type, {essl,[]}},
  {modules, [mod_alias,mod_auth,mod_esi,mod_actions,mod_cgi,mod_dir,mod_get,
             mod_head,mod_log,mod_disk_log]},
  {server_admin, "jocke@erix.ericsson.se"},
@@ -20,11 +19,9 @@
  {script_alias, {"/cgi-bin/", "/var/tmp/server_root/cgi-bin/"}},
  {script_alias, {"/htbin/", "/var/tmp/server_root/cgi-bin/"}},
  {erl_script_alias, {"/cgi-bin/erl", [httpd_example]}},
- {ssl, [{certfile, "/var/tmp/server_root/ssl/ssl_server_cert.pem"},
-        {keyfile, "/var/tmp/server_root/ssl/ssl_key.pem"},
-        {verify, verify_none}]},
- %%{script, {"HEAD" "/cgi-bin/printenv.sh"}},
- %%{action, {"image/gif", "/cgi-bin/printenv.sh"}},
+ {socket_type, {ssl, [{certfile, "/var/tmp/server_root/ssl/ssl_server_cert.pem"},
+		      {keyfile, "/var/tmp/server_root/ssl/ssl_key.pem"},
+		      {verify, verify_none}]}},
  {directory, {"/var/tmp/server_root/htdocs/open",
               [{require,["user","one","Aladdin"]},
                {auth_group_file,"/var/tmp/server_root/auth/group"},
-- 
2.35.3

Places

File 5432-ssl-Correct-example-in-PR-7079.patch of Package erlang (Revision b3a22b16b9b462356a1a0d804f54fae1)

Places