File atheme-config.diff of Package atheme

Give Atheme a good default config that harmonizes with the
ircd-seven package, such that installing ircd7 and atheme,
and then starting both gives a directly usable Services.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 dist/atheme.conf.example |   72 +++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 42 deletions(-)

Index: atheme-services-7.1.0/dist/atheme.conf.example
===================================================================
--- atheme-services-7.1.0.orig/dist/atheme.conf.example
+++ atheme-services-7.1.0/dist/atheme.conf.example
@@ -67,7 +67,7 @@
  * If your IRCd vendor has supplied a module file, build it and load it here
  * instead of one above.
  */
-#loadmodule "modules/protocol/charybdis";
+loadmodule "modules/protocol/charybdis";
 
 /* Protocol mixins.
  *
@@ -749,7 +749,7 @@ loadmodule "modules/groupserv/set_url";
  *
  * HTTP Server                                  modules/misc/httpd
  */
-loadmodule "modules/misc/httpd";
+#loadmodule "modules/misc/httpd";
 
 /* XMLRPC server module.
  * 
@@ -798,7 +798,7 @@ serverinfo {
 	 * unique on the IRC network and contain at least one dot, but does
 	 * not have to be equal to any DNS name.
 	 */
-	name = "services.int";
+	name = "services.localhost.";
 
 	/* desc
 	 * The ``server comment'' we send to the IRC network.
@@ -820,24 +820,24 @@ serverinfo {
 	/* (*)netname
 	 * The name of your network.
 	 */
-	netname = "misconfigured network";
+	netname = "unconfigured network";
 
 	/* (*)hidehostsuffix
 	 * P10 +x host hiding gives <account>.<hidehostsuffix>.
 	 * If using +x on asuka/bircd/undernet, this must agree
 	 * with F:HIDDEN_HOST.
 	 */
-	hidehostsuffix = "users.misconfigured";
+	hidehostsuffix = "users.unconfigured";
 
 	/* (*)adminname
 	 * The name of the person running this service.
 	 */
-	adminname = "misconfigured admin";
+	adminname = "unconfigured admin";
 
 	/* (*)adminemail
 	 * The email address of the person running this service.
 	 */
-	adminemail = "misconfigured@admin.tld";
+	adminemail = "unconfigured@admin.tld";
 
 	/* (*)registeremail
 	 * The email address that messages should be originated from.
@@ -936,12 +936,12 @@ serverinfo {
  * To link Atheme over ssl, please connect Atheme to a local ircd and have that
  * connect to your network over SSL.
  */
-uplink "irc.example.net" {
+uplink "localhost." {
 	// The server name of the ircd you're linking to goes above.
 
 	// host
 	// The hostname to connect to.
-	host = "127.0.0.1";
+	host = "localhost";
 
 	// vhost
 	// The source IP to connect from, used on machines with multiple interfaces.
@@ -960,18 +960,6 @@ uplink "irc.example.net" {
 	port = 6667;
 };
 
-/* this is an example for using an IPv6 address as an uplink */
-uplink "irc6.example.net" {
-	host = "::1";
-
-	// password
-	// If you want to have same send_password and accept_password, you
-	// can specify both using 'password' instead of individually.
-	password = "linkage";
-
-	port = 6667;
-};
-
 /* Services configuration.
  *
  * Each of these blocks can contain a nick, user, host, real and aliases.
@@ -1016,7 +1004,7 @@ nickserv {
 	/* (*)host
 	 * The hostname we want NickServ to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want NickServ to have.
@@ -1113,7 +1101,7 @@ chanserv {
 	/* (*)host
 	 * The hostname we want the client to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS of the client.
@@ -1142,7 +1130,7 @@ chanserv {
 	 * use a lot of CPU up, and will only work if you have
 	 * join_chans (in general) enabled as well.
 	 */
-	fantasy;
+	#fantasy;
 
 	/* (*) hide_xop
 	 * Hide the XOP templates from sight.  This is useful if you
@@ -1315,7 +1303,7 @@ global {
 	/* (*)host
 	 * The hostname used for this client.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1344,7 +1332,7 @@ infoserv {
 	/* (*)host
 	 * The hostname used for this client,
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1380,7 +1368,7 @@ operserv {
 	/* (*)host
 	 * The hostname used for this client.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1421,7 +1409,7 @@ saslserv {
 	/* (*)host
 	 * The hostname we want SaslServ to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want SaslServ to have.
@@ -1450,7 +1438,7 @@ memoserv {
 	/* (*)host
 	 * The hostname we want MemoServ to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want MemoServ to have.
@@ -1495,7 +1483,7 @@ gameserv {
 	/* (*)host
 	 * The hostname used for this client.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1535,7 +1523,7 @@ rpgserv {
 	/* (*)host
 	 * The hostname used for this client.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1610,7 +1598,7 @@ groupserv {
 	/* (*)host
 	 * The hostname we want GroupServ to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want GroupServ to have.
@@ -1675,7 +1663,7 @@ hostserv {
 	/* (*)host
 	 * The hostname used for this client.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The GECOS (real name) of the client.
@@ -1724,7 +1712,7 @@ helpserv {
 	/* (*)host
 	 * The hostname we want HelpServ to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want HelpServ to have.
@@ -1778,7 +1766,7 @@ alis {
 	/* (*)host
 	 * The hostname we want ALIS to have.
 	 */
-	host = "services.int";
+	host = "services.localhost.";
 
 	/* (*)real
 	 * The realname (gecos) information we want ALIS to have.
@@ -1798,18 +1786,18 @@ httpd {
 	 * The host that the HTTP server will listen on.
 	 * Use 0.0.0.0 if you want to listen on all available hosts.
 	 */
-	host = "0.0.0.0";
+	#host = "0.0.0.0";
 
 	/* host (ipv6)
 	 * If you want, you can have Atheme listen on an IPv6 host too.
 	 * Use :: if you want to listen on all available IPv6 hosts.
 	 */
-	#host = "::";
+	host = "::";
 
 	/* www_root
 	 * The directory that contains the files that should be served by the httpd.
 	 */
-	www_root = "/var/www";
+	www_root = "/usr/lib/atheme/www";
 
 	/* port
 	 * The port that the HTTP server will listen on.
@@ -1870,17 +1858,17 @@ ldap {
  * This block logs all account and channel registrations and drops,
  * and account and channel setting changes to var/account.log.
  */
-logfile "var/account.log" { register; set; };
+logfile "/var/log/ateme/account.log" { register; set; };
 
 /*
  * This block logs all command use to var/commands.log.
  */
-logfile "var/commands.log" { commands; };
+logfile "/var/log/atheme/commands.log" { commands; };
 
 /*
  * This block logs all security auditing information.
  */
-logfile "var/audit.log" { denycmd; };
+logfile "/var/log/atheme/audit.log" { denycmd; };
 
 /*
  * You can log to IRC channels, and even split it by category, too.
@@ -1963,7 +1951,7 @@ general {
 	 * network channels by keeping them open, and to preserve the
 	 * topic and +beI lists.
 	 */
-	leave_chans;
+	#leave_chans;
 
 	/* secure
 	 * Do you want to require the use of /msg <service>@<services host>?
openSUSE Build Service is sponsored by