1 files changed, 43 insertions, 49 deletions

diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index e13e8fdd1..6d551e26b 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -40,15 +40,6 @@ service
 	 * unable to do certain things if this option is enabled.
 	 */
 	#modes = "+o"
-
-	/*
-	 * An optional comma separated list of channels this service should join. Outside
-	 * of log channels this is not very useful, as the service will just idle in the
-	 * specified channels, and will not accept any types of commands.
-	 *
-	 * Prefixes may be given to the channels in the form of mode characters or prefix symbols.
-	 */
-	#channels = "@#services,#mychan"
 }
 
 /*
@@ -58,7 +49,7 @@ service
  */
 module
 {
-	name = "hostserv"
+	name = "hostserv/main"
 
 	/*
 	 * The name of the client that should be HostServ.
@@ -69,6 +60,11 @@ module
 	 * If enabled, vhosts are activated on users immediately when they are set.
 	 */
 	activate_on_set = false
+
+	/*
+	 * Maximum number of vhosts that can be assigned to an account.
+	 */
+	max_vhosts = 8
 }
 
 /*
@@ -86,71 +82,67 @@ module
 command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
 
 /*
- * hs_del
+ * hostserv/add
+ *
+ * Provides the command hostserv/add.
  *
- * Provides the commands hostserv/del and hostserv/delall.
+ * Used for setting users' vHosts.
+ */
+module { name = "hostserv/add" }
+command { service = "HostServ"; name = "ADD"; command = "hostserv/add"; permission = "hostserv/add"; }
+
+/*
+ * hostserv/del
+ *
+ * Provides the command hostserv/del.
  *
  * Used for removing users' vHosts.
  */
-module { name = "hs_del" }
+module { name = "hostserv/del" }
 command { service = "HostServ"; name = "DEL"; command = "hostserv/del"; permission = "hostserv/del"; }
-command { service = "HostServ"; name = "DELALL"; command = "hostserv/delall"; permission = "hostserv/del"; }
 
 /*
- * hs_group
+ * hostserv/info
  *
- * Provides the command hostserv/group.
+ * Provides the command hostserv/info.
  *
- * Used for grouping one vHost to many nicks.
+ * Used for viewing users' vHosts.
  */
-module
-{
-	name = "hs_group"
-
-	/*
-	 * Upon nickserv/group, this option syncs the nick's main vHost to the grouped nick.
-	 */
-	syncongroup = false
-
-	/*
-	 * This makes vhosts act as if they are per account.
-	 */
-	synconset = false
-}
-command { service = "HostServ"; name = "GROUP"; command = "hostserv/group"; }
+module { name = "hostserv/info" }
+command { service = "HostServ"; name = "INFO"; command = "hostserv/info"; }
 
 /*
- * hs_list
+ * hostserv/list
  *
  * Provides the command hostserv/list.
  *
  * Used for listing actively set vHosts.
  */
-module { name = "hs_list" }
+module { name = "hostserv/list" }
 command { service = "HostServ"; name = "LIST"; command = "hostserv/list"; permission = "hostserv/list"; }
 
 /*
- * hs_off
+ * hostserv/off
  *
  * Provides the command hostserv/off.
  *
  * Used for turning off your vHost.
  */
-module { name = "hs_off" }
+module { name = "hostserv/off" }
 command { service = "HostServ"; name = "OFF"; command = "hostserv/off"; }
 
 /*
- * hs_on
+ * hostserv/on
  *
  * Provides the command hostserv/on.
  *
  * Used for turning on your vHost.
  */
-module { name = "hs_on" }
+module { name = "hostserv/on" }
 command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
 
 /*
- * hs_request
+ * hostserv/request
  *
  * Provides the commands hostserv/request, hostserv/activate, hostserv/reject, and hostserv/waiting.
  *
@@ -158,7 +150,7 @@ command { service = "HostServ"; name = "ON"; command = "hostserv/on"; }
  */
 module
 {
-	name = "hs_request"
+	name = "hostserv/request"
 
 	/*
 	 * If set, Services will send a memo to the user requesting a vHost when it's been
@@ -172,17 +164,19 @@ module
 	#memooper = yes
 }
 command { service = "HostServ"; name = "REQUEST"; command = "hostserv/request"; }
-command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/set"; }
+command { service = "HostServ"; name = "ACTIVATE"; command = "hostserv/activate"; permission = "hostserv/add"; }
+command { service = "HostServ"; name = "REJECT"; command = "hostserv/reject"; permission = "hostserv/add"; }
+command { service = "HostServ"; name = "WAITING"; command = "hostserv/waiting"; permission = "hostserv/add"; }
 
 /*
- * hs_set
+ * hostserv/set
  *
- * Provides the commands hostserv/set and hostserv/setall.
+ * Provides the commands:
+ *   hostserv/set - Dummy help wrappers for the SET commands.
+ *   hostserv/set/default - Used for configuring your default vhost.
  *
- * Used for setting users' vHosts.
+ * Used for managing vhost settings.
  */
-module { name = "hs_set" }
-command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set"; }
+module { name = "hostserv/set" }
+command { service = "HostServ"; name = "SET"; command = "hostserv/set"; }
+command { service = "HostServ"; name = "SET DEFAULT"; command = "hostserv/set/default"; }