jengelh/atheme
SHA256
1
0
Fork 0
forked from pool/atheme
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/server:irc/atheme?expand=0&rev=57

Browse Source
This commit is contained in:
Jan Engelhardt 2014-08-09 13:27:27 +00:00 committed by Git OBS Bridge
parent 2ef756358c
commit ac6c58c024
2 changed files with 64 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
atheme-config.diff
View File

@ -4,8 +4,8 @@ and then starting both gives a directly usable Services.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
dist/atheme.conf.example | 54 +++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 27 deletions(-)
dist/atheme.conf.example | 72 +++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 42 deletions(-)
Index: atheme-services-7.1.0/dist/atheme.conf.example
===================================================================
@ -67,7 +67,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)registeremail
* The email address that messages should be originated from.
@@ -936,7 +936,7 @@ serverinfo {
@@ -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.
*/
@ -76,16 +76,32 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
// The server name of the ircd you're linking to goes above.
// host
@@ -967,7 +967,7 @@ uplink "irc6.example.net" {
// password
// If you want to have same send_password and accept_password, you
// can specify both using 'password' instead of individually.
- password = "linkage";
+ password = "servicespassword";
// 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;
};
@@ -1016,7 +1016,7 @@ nickserv {
-/* 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.
*/
@ -94,7 +110,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want NickServ to have.
@@ -1113,7 +1113,7 @@ chanserv {
@@ -1113,7 +1101,7 @@ chanserv {
/* (*)host
* The hostname we want the client to have.
*/
@ -103,7 +119,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS of the client.
@@ -1142,7 +1142,7 @@ chanserv {
@@ -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.
*/
@ -112,7 +128,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*) hide_xop
* Hide the XOP templates from sight. This is useful if you
@@ -1315,7 +1315,7 @@ global {
@@ -1315,7 +1303,7 @@ global {
/* (*)host
* The hostname used for this client.
*/
@ -121,7 +137,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1344,7 +1344,7 @@ infoserv {
@@ -1344,7 +1332,7 @@ infoserv {
/* (*)host
* The hostname used for this client,
*/
@ -130,7 +146,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1380,7 +1380,7 @@ operserv {
@@ -1380,7 +1368,7 @@ operserv {
/* (*)host
* The hostname used for this client.
*/
@ -139,7 +155,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1421,7 +1421,7 @@ saslserv {
@@ -1421,7 +1409,7 @@ saslserv {
/* (*)host
* The hostname we want SaslServ to have.
*/
@ -148,7 +164,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want SaslServ to have.
@@ -1450,7 +1450,7 @@ memoserv {
@@ -1450,7 +1438,7 @@ memoserv {
/* (*)host
* The hostname we want MemoServ to have.
*/
@ -157,7 +173,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want MemoServ to have.
@@ -1495,7 +1495,7 @@ gameserv {
@@ -1495,7 +1483,7 @@ gameserv {
/* (*)host
* The hostname used for this client.
*/
@ -166,7 +182,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1535,7 +1535,7 @@ rpgserv {
@@ -1535,7 +1523,7 @@ rpgserv {
/* (*)host
* The hostname used for this client.
*/
@ -175,7 +191,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1610,7 +1610,7 @@ groupserv {
@@ -1610,7 +1598,7 @@ groupserv {
/* (*)host
* The hostname we want GroupServ to have.
*/
@ -184,7 +200,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want GroupServ to have.
@@ -1675,7 +1675,7 @@ hostserv {
@@ -1675,7 +1663,7 @@ hostserv {
/* (*)host
* The hostname used for this client.
*/
@ -193,7 +209,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The GECOS (real name) of the client.
@@ -1724,7 +1724,7 @@ helpserv {
@@ -1724,7 +1712,7 @@ helpserv {
/* (*)host
* The hostname we want HelpServ to have.
*/
@ -202,7 +218,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want HelpServ to have.
@@ -1778,7 +1778,7 @@ alis {
@@ -1778,7 +1766,7 @@ alis {
/* (*)host
* The hostname we want ALIS to have.
*/
@ -211,7 +227,29 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/* (*)real
* The realname (gecos) information we want ALIS to have.
@@ -1870,17 +1870,17 @@ ldap {
@@ -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.
*/
@ -232,7 +270,7 @@ Index: atheme-services-7.1.0/dist/atheme.conf.example
/*
* You can log to IRC channels, and even split it by category, too.
@@ -1963,7 +1963,7 @@ general {
@@ -1963,7 +1951,7 @@ general {
* network channels by keeping them open, and to preserve the
* topic and +beI lists.
*/

2
atheme.service
View File

@ -2,7 +2,7 @@
Description=Atheme IRC Services
[Service]
ExecStart=/usr/sbin/atheme-services
ExecStart=/usr/sbin/atheme-services -n
User=atheme
Group=atheme