Make vhosts assignable to accounts, not nicks. Allow multiple vhosts per account.

2 files changed, 26 insertions, 27 deletions

diff --git a/data/anope.example.conf b/data/anope.example.conf
index 1a72403dd..9a0384e6f 100644
--- a/data/anope.example.conf
+++ b/data/anope.example.conf
@@ -759,6 +759,7 @@ log
  *  chanserv/auspex               - Can see any information with /chanserv info
  *  chanserv/no-register-limit    - May register an unlimited number of channels and nicknames
  *  chanserv/kick                 - Can kick and ban users from channels through ChanServ
+ *  hostsev/auspex                - Can view other users vhosts
  *  memoserv/info                 - Can see any information with /memoserv info
  *  memoserv/set-limit            - Can set the limit of max stored memos on any user and channel
  *  memoserv/no-limit             - Can send memos through limits and throttles
diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index 685eb9722..928261b26 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -77,38 +77,34 @@ module
 command { service = "HostServ"; name = "HELP"; command = "generic/help"; }
 
 /*
+ * hostserv/add
+ *
+ * Provides the command hostserv/add.
+ *
+ * Used for setting users' vHosts.
+ */
+module { name = "hostserv/add" }
+command { service = "HostServ"; name = "ADD"; command = "hostserv/add"; permission = "hostserv/add"; }
+
+/*
  * hostserv/del
  *
- * Provides the commands hostserv/del and hostserv/delall.
+ * Provides the command hostserv/del.
  *
  * Used for removing users' vHosts.
  */
 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"; }
 
 /*
- * hostserv/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 = "hostserv/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"; }
 
 /*
  * hostserv/list
@@ -163,17 +159,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"; }
 
 /*
  * 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 = "hostserv/set" }
-command { service = "HostServ"; name = "SET"; command = "hostserv/set"; permission = "hostserv/set"; }
-command { service = "HostServ"; name = "SETALL"; command = "hostserv/setall"; permission = "hostserv/set"; }
+command { service = "HostServ"; name = "SET"; command = "hostserv/set"; }
+command { service = "HostServ"; name = "SET DEFAULT"; command = "hostserv/set/default"; }