Merge pull request #19 from mauricelambert/dev

[3.0.36] Fix: missing default configurations
mauricelambert · Jun 18, 2024 · dd54989 · dd54989
2 parents b1363ca + 1a48ccf
commit dd54989
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/PKG-INFO b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WebScripts
-Version: 3.0.35
+Version: 3.0.36
 Summary: This tool runs CLI scripts and displays output in a Web Interface.
 Home-page: https://github.com/mauricelambert/WebScripts
 Author: Maurice Lambert

diff --git a/Scripts/wsgi.py b/Scripts/wsgi.py
@@ -23,7 +23,7 @@
 This tool runs CLI scripts and displays output in a Web Interface.
 """
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 __author__ = "Maurice Lambert"
 __author_email__ = "mauricelambert434@gmail.com"
 __maintainer__ = "Maurice Lambert"
@@ -77,9 +77,6 @@ def __init__(self, config_cfg: List[str], config_json: List[str]):
  self.config_cfg = config_cfg
  self.config_json = config_json
 
-
-configure_logs_system()
-
 paths = Paths([], [])
 
 server, _ = prepare_server()
@@ -101,4 +98,3 @@ def __init__(self, config_cfg: List[str], config_json: List[str]):
 
 logger_warning("Starting server...")
 application = server.app
-
diff --git a/WebScripts.egg-info/PKG-INFO b/WebScripts.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: WebScripts
-Version: 3.0.35
+Version: 3.0.36
 Summary: This tool runs CLI scripts and displays output in a Web Interface.
 Home-page: https://github.com/mauricelambert/WebScripts
 Author: Maurice Lambert

diff --git a/WebScripts/WebScripts.py b/WebScripts/WebScripts.py
@@ -26,7 +26,7 @@
 the Server class and the Configuration class).
 """
 
-__version__ = "1.0.6"
+__version__ = "1.0.7"
 __author__ = "Maurice Lambert"
 __author_email__ = "mauricelambert434@gmail.com"
 __maintainer__ = "Maurice Lambert"
@@ -170,16 +170,21 @@ class Configuration(DefaultNamespace):
  "log_level": 0,
  "statics_path": [],
  "scripts_path": [],
+ "json_scripts_config": [],
+ "ini_scripts_config": [],
  "modules_path": [],
  "exclude_auth_paths": ["/static/", "/js/"],
  "exclude_auth_pages": ["/api/", "/auth/", "/web/auth/"],
  "auth_script": None,
  "active_auth": False,
  "webproxy_number": None,
+ "smtp_starttls": None,
+ "smtp_ssl": None,
  "documentations_path": [],
  "accept_unknow_user": True,
  "force_file_permissions": True,
  "auth_failures_to_blacklist": None,
+ "blacklist_time": None,
  "accept_unauthenticated_user": True,
  }
  __required__ = ("interface", "port")

diff --git a/WebScripts/__init__.py b/WebScripts/__init__.py
@@ -23,7 +23,7 @@
 This tool runs CLI scripts and displays output in a Web Interface.
 """
 
-__version__ = "3.0.35"
+__version__ = "3.0.36"
 __author__ = "Maurice Lambert"
 __author_email__ = "mauricelambert434@gmail.com"
 __maintainer__ = "Maurice Lambert"

diff --git a/WebScripts/__main__.py b/WebScripts/__main__.py
@@ -23,7 +23,7 @@
 This tool runs CLI scripts and displays output in a Web Interface.
 """
 
-__version__ = "3.0.35"
+__version__ = "3.0.36"
 __author__ = "Maurice Lambert"
 __author_email__ = "mauricelambert434@gmail.com"
 __maintainer__ = "Maurice Lambert"

diff --git a/WebScripts/static/html/WebScripts.html b/WebScripts/static/html/WebScripts.html
@@ -6,7 +6,7 @@
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
 <tr bgcolor="#9286C2">
 <td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>WebScripts</strong></big></big> (version 1.0.6)</font></td
+<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>WebScripts</strong></big></big> (version 1.0.7)</font></td
 ><td align=right valign=bottom
 ><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="webscripts.py">webscripts.py</a></font></td></tr></table>
  <p><tt>This&nbsp;tool&nbsp;runs&nbsp;CLI&nbsp;scripts&nbsp;and&nbsp;displays&nbsp;output&nbsp;in&nbsp;a&nbsp;Web&nbsp;Interface.<br>
@@ -68,7 +68,7 @@
 
 <hr>
 Data and other attributes defined here:<br>
-<dl><dt><strong>__defaults__</strong> = {'accept_unauthenticated_user': True, 'accept_unknow_user': True, 'active_auth': False, 'auth_failures_to_blacklist': None, 'auth_script': None, 'cgi_path': [], 'documentations_path': [], 'exclude_auth_pages': ['/api/', '/auth/', '/web/auth/'], 'exclude_auth_paths': ['/static/', '/js/'], 'force_file_permissions': True, ...}</dl>
+<dl><dt><strong>__defaults__</strong> = {'accept_unauthenticated_user': True, 'accept_unknow_user': True, 'active_auth': False, 'auth_failures_to_blacklist': None, 'auth_script': None, 'blacklist_time': None, 'cgi_path': [], 'documentations_path': [], 'exclude_auth_pages': ['/api/', '/auth/', '/web/auth/'], 'exclude_auth_paths': ['/static/', '/js/'], ...}</dl>
 
 <dl><dt><strong>__optional__</strong> = ('debug', 'security', 'active_auth', 'auth_script', 'accept_unknow_user', 'accept_unauthenticated_user', 'exclude_auth_paths', 'exclude_auth_pages', 'modules', 'modules_path', 'js_path', 'statics_path', 'documentations_path', 'scripts_path', 'json_scripts_config', 'ini_scripts_config', 'log_level', 'log_filename', 'log_level', 'log_format', ...)</dl>
 

diff --git a/WebScripts/static/html/index.html b/WebScripts/static/html/index.html
@@ -6,7 +6,7 @@
 <table width="100%" cellspacing=0 cellpadding=2 border=0 summary="heading">
 <tr bgcolor="#9286C2">
 <td valign=bottom>&nbsp;<br>
-<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>__init__</strong></big></big> (version 3.0.35)</font></td
+<font color="#ffffff" face="helvetica, arial">&nbsp;<br><big><big><strong>__init__</strong></big></big> (version 3.0.36)</font></td
 ><td align=right valign=bottom
 ><font color="#ffffff" face="helvetica, arial"><a href=".">index</a><br><a href="__init__.py">__init__.py</a></font></td></tr></table>
  <p><tt>This&nbsp;tool&nbsp;runs&nbsp;CLI&nbsp;scripts&nbsp;and&nbsp;displays&nbsp;output&nbsp;in&nbsp;a&nbsp;Web&nbsp;Interface.</tt></p>
@@ -55,7 +55,7 @@
 
 <hr>
 Data and other attributes defined here:<br>
-<dl><dt><strong>__defaults__</strong> = {'accept_unauthenticated_user': True, 'accept_unknow_user': True, 'active_auth': False, 'auth_failures_to_blacklist': None, 'auth_script': None, 'cgi_path': [], 'documentations_path': [], 'exclude_auth_pages': ['/api/', '/auth/', '/web/auth/'], 'exclude_auth_paths': ['/static/', '/js/'], 'force_file_permissions': True, ...}</dl>
+<dl><dt><strong>__defaults__</strong> = {'accept_unauthenticated_user': True, 'accept_unknow_user': True, 'active_auth': False, 'auth_failures_to_blacklist': None, 'auth_script': None, 'blacklist_time': None, 'cgi_path': [], 'documentations_path': [], 'exclude_auth_pages': ['/api/', '/auth/', '/web/auth/'], 'exclude_auth_paths': ['/static/', '/js/'], ...}</dl>
 
 <dl><dt><strong>__optional__</strong> = ('debug', 'security', 'active_auth', 'auth_script', 'accept_unknow_user', 'accept_unauthenticated_user', 'exclude_auth_paths', 'exclude_auth_pages', 'modules', 'modules_path', 'js_path', 'statics_path', 'documentations_path', 'scripts_path', 'json_scripts_config', 'ini_scripts_config', 'log_level', 'log_filename', 'log_level', 'log_format', ...)</dl>