diff --git a/evennia/game_template/server/conf/proxy_plugins.py b/evennia/game_template/server/conf/proxy_plugins.py deleted file mode 100644 index 3ac6c1969b..0000000000 --- a/evennia/game_template/server/conf/proxy_plugins.py +++ /dev/null @@ -1,13 +0,0 @@ -""" -Proxy plugin hooks. -""" - - -def start_proxy_service(web_root): - """ - This plugin module can define user-created services for the Portal to - start. This is necessary for exposing web-based protocols. - - - """ - return web_root diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index 3e0c64e12d..abbdb7f3a6 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -41,11 +41,6 @@ except Exception: PORTAL_SERVICES_PLUGIN_MODULES = [ mod_import(module) for module in make_iter(settings.PORTAL_SERVICES_PLUGIN_MODULES) ] - -PROXY_PLUGIN_MODULES = [ - mod_import(module) for module in make_iter(settings.PROXY_PLUGIN_MODULES) -] - LOCKDOWN_MODE = settings.LOCKDOWN_MODE # ------------------------------------------------------------- @@ -357,9 +352,6 @@ if WEBSERVER_ENABLED: web_root.putChild(b"webclientdata", ajax_webclient) webclientstr = "webclient (ajax only)" - for plugin_module in PROXY_PLUGIN_MODULES: - web_root = plugin_module.start_proxy_service(web_root) - if WEBSOCKET_CLIENT_ENABLED and not websocket_started: # start websocket client port for the webclient # we only support one websocket client diff --git a/evennia/settings_default.py b/evennia/settings_default.py index fc08cacce1..5ecafb75b5 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -356,8 +356,6 @@ PORTAL_SERVICES_PLUGIN_MODULES = ["server.conf.portal_services_plugins"] MSSP_META_MODULE = "server.conf.mssp" # Module for web plugins. WEB_PLUGINS_MODULE = "server.conf.web_plugins" -# Module for Proxy plugins -PROXY_PLUGIN_MODULES = ["server.conf.proxy_plugins"] # Tuple of modules implementing lock functions. All callable functions # inside these modules will be available as lock functions. LOCK_FUNC_MODULES = ("evennia.locks.lockfuncs", "server.conf.lockfuncs")