From 8e71735d4d411b35dd9ac3eecaa89dc5b848fdbe Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 1 Apr 2022 23:54:09 -0500 Subject: [PATCH] Add bind address to config --- src/main/java/dev/plex/HTTPDModule.java | 22 +++++++++++++--------- src/main/resources/settings.yml | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/dev/plex/HTTPDModule.java b/src/main/java/dev/plex/HTTPDModule.java index 3ff9831..08ea1a2 100644 --- a/src/main/java/dev/plex/HTTPDModule.java +++ b/src/main/java/dev/plex/HTTPDModule.java @@ -20,7 +20,6 @@ import org.eclipse.jetty.servlet.ServletHandler; public class HTTPDModule extends PlexModule { - public static ServletContextHandler context; private Thread serverThread; private AtomicReference atomicServer = new AtomicReference<>(); @@ -28,17 +27,22 @@ public class HTTPDModule extends PlexModule @Getter private static Permission permissions = null; - private ModuleConfig config; + private ModuleConfig moduleConfig; + + @Override + public void load() + { + moduleConfig = new ModuleConfig(this, "settings.yml"); + } @Override public void enable() { - config = new ModuleConfig(this, "settings.yml"); - config.load(); - PlexLog.debug("HTTPD Module Port: {0}", config.getInt("server.port")); + moduleConfig.load(); + PlexLog.debug("HTTPD Module Port: {0}", moduleConfig.getInt("server.port")); if (!setupPermissions() && getPlex().getSystem().equalsIgnoreCase("permissions") && !Bukkit.getPluginManager().isPluginEnabled("Vault")) { - throw new RuntimeException("Plex-HTTPD requires the 'Vault' plugin as well as a Permissions plugin that hooks into 'Vault.' We recommend LuckPerms!"); + throw new RuntimeException("Plex-HTTPD requires the 'Vault' plugin as well as a Permissions plugin that hooks into 'Vault'. We recommend LuckPerms!"); } serverThread = new Thread(() -> { @@ -50,8 +54,8 @@ public class HTTPDModule extends PlexModule configuration.addCustomizer(new ForwardedRequestCustomizer()); HttpConnectionFactory factory = new HttpConnectionFactory(configuration); ServerConnector connector = new ServerConnector(server, factory); - connector.setPort(config.getInt("server.port")); - connector.setHost("0.0.0.0"); + connector.setPort(moduleConfig.getInt("server.port")); + connector.setHost(moduleConfig.getString("server.bind-address")); new GetEndpoints(); @@ -76,7 +80,7 @@ public class HTTPDModule extends PlexModule @Override public void disable() { - PlexLog.debug("Stopping jetty server"); + PlexLog.debug("Stopping Jetty server"); try { atomicServer.get().stop(); diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml index 47a8c85..51742e3 100644 --- a/src/main/resources/settings.yml +++ b/src/main/resources/settings.yml @@ -1,2 +1,3 @@ server: + bind-address: 0.0.0.0 port: 27192 \ No newline at end of file