Merge branch 'next/minor' of github.com:Start9Labs/start-os into next/major

core/startos/src/net/mod.rs

@@ -1,13 +1,13 @@
 use rpc_toolkit::{Context, HandlerExt, ParentHandler};
 
 pub mod acme;
-pub mod dhcp;
 pub mod dns;
 pub mod forward;
 pub mod host;
 pub mod keys;
 pub mod mdns;
 pub mod net_controller;
+pub mod network_interface;
 pub mod service_interface;
 pub mod ssl;
 pub mod static_server;
@@ -17,20 +17,23 @@ pub mod vhost;
 pub mod web_server;
 pub mod wifi;
 
-pub const PACKAGE_CERT_PATH: &str = "/var/lib/embassy/ssl";
-
 pub fn net<C: Context>() -> ParentHandler<C> {
     ParentHandler::new()
         .subcommand(
             "tor",
             tor::tor::<C>().with_about("Tor commands such as list-services, logs, and reset"),
         )
-        .subcommand(
-            "dhcp",
-            dhcp::dhcp::<C>().with_about("Command to update IP assigned from dhcp"),
-        )
         .subcommand(
             "acme",
             acme::acme::<C>().with_about("Setup automatic clearnet certificate acquisition"),
         )
+        .subcommand(
+            "network-interface",
+            network_interface::network_interface_api::<C>()
+                .with_about("View and edit network interface configurations"),
+        )
+        .subcommand(
+            "vhost",
+            vhost::vhost_api::<C>().with_about("Manage ssl virtual host proxy"),
+        )
 }