File srvx-1.3.1_default_paths.patch of Package srvx
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -8,13 +8,17 @@ srvx: src/srvx
cp ./src/srvx $(srcdir)/src/*.help .
install-exec-local:
- $(INSTALL) -d -m 755 $(prefix)
- $(INSTALL) -m 744 ./src/srvx $(prefix)
- $(INSTALL) -m 644 $(srcdir)/src/*.help $(prefix)
- $(INSTALL) -m 600 $(srcdir)/srvx.conf.example $(prefix)
- $(INSTALL) -m 644 $(srcdir)/sockcheck.conf.example $(prefix)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(prefix)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
+ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/srvx/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/srvx/help/
+ $(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)
+ $(INSTALL) -D -m 744 ./src/srvx $(DESTDIR)$(sbindir)
+ $(INSTALL) -m 644 $(srcdir)/src/*.help $(DESTDIR)$(datadir)/srvx/help
+ $(INSTALL) -m 600 $(srcdir)/srvx.conf.example $(DESTDIR)$(sysconfdir)
+ $(INSTALL) -m 644 $(srcdir)/sockcheck.conf.example $(DESTDIR)$(sysconfdir)
@echo
- @echo srvx-$(VERSION) has been installed to $(prefix)
+ @echo srvx-$(VERSION) has been installed to $(DESTDIR)$(prefix)
@echo Remember to edit srvx.conf.example and sockcheck.conf.example
@echo And of course, ./srvx --help before starting.
@echo
Index: src/main.c
===================================================================
--- src/main.c.orig
+++ src/main.c
@@ -18,7 +18,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#define PID_FILE "srvx.pid"
+#define PID_FILE "/var/run/srvx/srvx.pid"
#include "conf.h"
#include "gline.h"
@@ -63,7 +63,7 @@ struct log_type *MAIN_LOG;
int quit_services, max_cycles;
-char *services_config = "srvx.conf";
+char *services_config = "/etc/srvx/srvx.conf";
char **services_argv;
int services_argc;
@@ -821,7 +821,7 @@ int main(int argc, char *argv[])
reg_exit_func(main_shutdown);
log_init();
- MAIN_LOG = log_register_type("srvx", "file:main.log");
+ MAIN_LOG = log_register_type("srvx", "file:" MOD_LOG_DIR "main.log");
if (debug)
log_debug();
timeq_init();
Index: src/modcmd.c
===================================================================
--- src/modcmd.c.orig
+++ src/modcmd.c
@@ -2079,7 +2079,7 @@ modcmd_init(void) {
reg_exit_func(modcmd_cleanup);
conf_register_reload(modcmd_conf_read);
- modcmd_module = module_register("modcmd", MAIN_LOG, "modcmd.help", modcmd_expand);
+ modcmd_module = module_register("modcmd", MAIN_LOG, MOD_HELP_PATH "modcmd.help", modcmd_expand);
bind_command = modcmd_register(modcmd_module, "bind", cmd_bind, 4, MODCMD_KEEP_BOUND, "oper_level", "800", NULL);
help_command = modcmd_register(modcmd_module, "help", cmd_help, 1, 0, "flags", "+nolog", NULL);
modcmd_register(modcmd_module, "command", cmd_command, 2, 0, "flags", "+nolog", NULL);
Index: src/mod-sockcheck.c
===================================================================
--- src/mod-sockcheck.c.orig
+++ src/mod-sockcheck.c
@@ -42,7 +42,7 @@
#if !defined(SOCKCHECK_DEBUG)
#define SOCKCHECK_DEBUG 0
#endif
-#define SOCKCHECK_TEST_DB "sockcheck.conf"
+#define SOCKCHECK_TEST_DB "/etc/srvx/sockcheck.conf"
enum sockcheck_decision {
CHECKING,
@@ -1169,13 +1169,13 @@ sockcheck_read_conf(void)
int
sockcheck_init(void)
{
- PC_LOG = log_register_type("ProxyCheck", "file:proxycheck.log");
+ PC_LOG = log_register_type("ProxyCheck", "file:" MOD_LOG_DIR "proxycheck.log");
conf_register_reload(sockcheck_read_conf);
reg_exit_func(sockcheck_shutdown);
_sockcheck_init();
message_register_table(msgtab);
- sockcheck_module = module_register("ProxyCheck", PC_LOG, "mod-sockcheck.help", NULL);
+ sockcheck_module = module_register("ProxyCheck", PC_LOG, MOD_HELP_PATH "mod-sockcheck.help", NULL);
modcmd_register(sockcheck_module, "defproxy", cmd_defproxy, 2, 0, "level", "999", NULL);
modcmd_register(sockcheck_module, "hostscan", cmd_hostscan, 2, 0, "level", "650", NULL);
modcmd_register(sockcheck_module, "clearhost", cmd_clearhost, 2, 0, "level", "650", NULL);
Index: src/chanserv.c
===================================================================
--- src/chanserv.c.orig
+++ src/chanserv.c
@@ -7179,7 +7179,7 @@ chanserv_db_cleanup(void) {
void
init_chanserv(const char *nick)
{
- CS_LOG = log_register_type("ChanServ", "file:chanserv.log");
+ CS_LOG = log_register_type("ChanServ", "file:" MOD_LOG_DIR "chanserv.log");
conf_register_reload(chanserv_conf_read);
reg_server_link_func(handle_server_link);
@@ -7204,7 +7204,7 @@ init_chanserv(const char *nick)
dict_set_free_data(mask_dnrs, free);
reg_svccmd_unbind_func(handle_svccmd_unbind);
- chanserv_module = module_register("ChanServ", CS_LOG, "chanserv.help", chanserv_expand_variable);
+ chanserv_module = module_register("ChanServ", CS_LOG, MOD_HELP_PATH "chanserv.help", chanserv_expand_variable);
DEFINE_COMMAND(register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+helping", NULL);
DEFINE_COMMAND(noregister, 1, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL);
DEFINE_COMMAND(allowregister, 2, 0, "template", "noregister", NULL);
Index: src/global.c
===================================================================
--- src/global.c.orig
+++ src/global.c
@@ -687,14 +687,14 @@ global_db_cleanup(void)
void
init_global(const char *nick)
{
- G_LOG = log_register_type("Global", "file:global.log");
+ G_LOG = log_register_type("Global", "file:" MOD_LOG_DIR "global.log");
reg_new_user_func(global_process_user);
reg_auth_func(global_process_auth);
reg_oper_func(global_process_oper);
conf_register_reload(global_conf_read);
- global_module = module_register("Global", G_LOG, "global.help", NULL);
+ global_module = module_register("Global", G_LOG, MOD_HELP_PATH "global.help", NULL);
modcmd_register(global_module, "LIST", cmd_list, 1, 0, "flags", "+oper", NULL);
modcmd_register(global_module, "MESSAGE", cmd_message, 3, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL);
modcmd_register(global_module, "MESSAGES", cmd_messages, 1, 0, NULL);
Index: src/mod-helpserv.c
===================================================================
--- src/mod-helpserv.c.orig
+++ src/mod-helpserv.c
@@ -44,7 +44,7 @@
#include "timeq.h"
#define HELPSERV_CONF_NAME "modules/helpserv"
-#define HELPSERV_HELPFILE_NAME "mod-helpserv.help"
+#define HELPSERV_HELPFILE_NAME MOD_HELP_PATH "mod-helpserv.help"
const char *helpserv_module_deps[] = { NULL };
/* db entries */
@@ -4459,7 +4459,7 @@ static void helpserv_db_cleanup(void) {
}
int helpserv_init() {
- HS_LOG = log_register_type("HelpServ", "file:helpserv.log");
+ HS_LOG = log_register_type("HelpServ", "file:" MOD_LOG_DIR "helpserv.log");
conf_register_reload(helpserv_conf_read);
helpserv_func_dict = dict_new();
Index: src/mod-memoserv.c
===================================================================
--- src/mod-memoserv.c.orig
+++ src/mod-memoserv.c
@@ -579,7 +579,7 @@ memoserv_unreg_account(UNUSED_ARG(struct
int
memoserv_init(void)
{
- MS_LOG = log_register_type("MemoServ", "file:memoserv.log");
+ MS_LOG = log_register_type("MemoServ", "file:" MOD_LOG_DIR "memoserv.log");
memos = dict_new();
dict_set_free_data(memos, delete_memo_account);
reg_auth_func(memoserv_check_messages);
@@ -589,7 +589,7 @@ memoserv_init(void)
reg_exit_func(memoserv_cleanup);
saxdb_register("MemoServ", memoserv_saxdb_read, memoserv_saxdb_write);
- memoserv_module = module_register("MemoServ", MS_LOG, "mod-memoserv.help", NULL);
+ memoserv_module = module_register("MemoServ", MS_LOG, MOD_HELP_PATH "mod-memoserv.help", NULL);
modcmd_register(memoserv_module, "send", cmd_send, 3, MODCMD_REQUIRE_AUTHED, NULL);
modcmd_register(memoserv_module, "list", cmd_list, 1, MODCMD_REQUIRE_AUTHED, NULL);
modcmd_register(memoserv_module, "read", cmd_read, 2, MODCMD_REQUIRE_AUTHED, NULL);
Index: src/modcmd.h
===================================================================
--- src/modcmd.h.orig
+++ src/modcmd.h
@@ -25,6 +25,9 @@
#include "helpfile.h"
#include "log.h"
+#define MOD_HELP_PATH "/usr/share/srvx/help/"
+#define MOD_LOG_DIR "/var/log/srvx/"
+
struct service;
struct svccmd;
struct module;
Index: src/nickserv.c
===================================================================
--- src/nickserv.c.orig
+++ src/nickserv.c
@@ -3744,7 +3744,7 @@ void
init_nickserv(const char *nick)
{
unsigned int i;
- NS_LOG = log_register_type("NickServ", "file:nickserv.log");
+ NS_LOG = log_register_type("NickServ", "file:" MOD_LOG_DIR "nickserv.log");
reg_new_user_func(handle_new_user);
reg_nick_change_func(handle_nick_change);
reg_del_user_func(nickserv_remove_user);
@@ -3763,7 +3763,7 @@ init_nickserv(const char *nick)
dict_set_free_keys(nickserv_email_dict, free);
dict_set_free_data(nickserv_email_dict, nickserv_free_email_addr);
- nickserv_module = module_register("NickServ", NS_LOG, "nickserv.help", NULL);
+ nickserv_module = module_register("NickServ", NS_LOG, MOD_HELP_PATH "nickserv.help", NULL);
modcmd_register(nickserv_module, "AUTH", cmd_auth, 2, MODCMD_KEEP_BOUND, "flags", "+qualified,+loghostmask", NULL);
nickserv_define_func("ALLOWAUTH", cmd_allowauth, 0, 1, 0);
nickserv_define_func("REGISTER", cmd_register, -1, 0, 1);
Index: src/opserv.c
===================================================================
--- src/opserv.c.orig
+++ src/opserv.c
@@ -4068,7 +4068,7 @@ opserv_db_cleanup(void)
void
init_opserv(const char *nick)
{
- OS_LOG = log_register_type("OpServ", "file:opserv.log");
+ OS_LOG = log_register_type("OpServ", "file:" MOD_LOG_DIR "opserv.log");
if (nick) {
const char *modes = conf_get_data("services/opserv/modes", RECDB_QSTRING);
opserv = AddService(nick, modes ? modes : NULL, "Oper Services", NULL);
@@ -4076,7 +4076,7 @@ init_opserv(const char *nick)
conf_register_reload(opserv_conf_read);
memset(level_strings, 0, sizeof(level_strings));
- opserv_module = module_register("OpServ", OS_LOG, "opserv.help", opserv_help_expand);
+ opserv_module = module_register("OpServ", OS_LOG, MOD_HELP_PATH "opserv.help", opserv_help_expand);
opserv_define_func("ACCESS", cmd_access, 0, 0, 0);
opserv_define_func("ADDALERT", cmd_addalert, 800, 0, 4);
opserv_define_func("ADDALERT NOTICE", NULL, 0, 0, 0);
Index: src/saxdb.c
===================================================================
--- src/saxdb.c.orig
+++ src/saxdb.c
@@ -483,7 +483,7 @@ saxdb_init(void) {
saxdbs = dict_new();
dict_set_free_data(saxdbs, saxdb_free);
saxdb_register("mondo", saxdb_mondo_reader, saxdb_mondo_writer);
- saxdb_module = module_register("saxdb", MAIN_LOG, "saxdb.help", saxdb_expand_help);
+ saxdb_module = module_register("saxdb", MAIN_LOG, MOD_HELP_PATH "saxdb.help", saxdb_expand_help);
modcmd_register(saxdb_module, "write", cmd_write, 2, MODCMD_REQUIRE_AUTHED, "level", "800", NULL);
modcmd_register(saxdb_module, "writeall", cmd_writeall, 0, MODCMD_REQUIRE_AUTHED, "level", "800", NULL);
modcmd_register(saxdb_module, "stats databases", cmd_stats_databases, 0, 0, NULL);
Index: src/sendmail.c
===================================================================
--- src/sendmail.c.orig
+++ src/sendmail.c
@@ -332,7 +332,7 @@ sendmail_init(void)
dict_set_free_data(prohibited_masks, free);
reg_exit_func(sendmail_cleanup);
saxdb_register("sendmail", sendmail_saxdb_read, sendmail_saxdb_write);
- sendmail_module = module_register("sendmail", MAIN_LOG, "sendmail.help", NULL);
+ sendmail_module = module_register("sendmail", MAIN_LOG, MOD_HELP_PATH "sendmail.help", NULL);
modcmd_register(sendmail_module, "banemail", cmd_banemail, 3, 0, "level", "601", NULL);
modcmd_register(sendmail_module, "stats email", cmd_stats_email, 0, 0, "flags", "+oper", NULL);
modcmd_register(sendmail_module, "unbanemail", cmd_unbanemail, 2, 0, "level", "601", NULL);
Index: srvx.conf.example
===================================================================
--- srvx.conf.example.orig
+++ srvx.conf.example
@@ -405,8 +405,8 @@
// "file:chanserv.log"). For "replay" severity, you must ALWAYS
// list a target to log it -- this is because it is very rarely
// useful.
- "*.*" ("std:out", "file:everything.log"); // does NOT suppress any defaults
+ "*.*" ("std:out", "file:/var/log/srvx/everything.log"); // does NOT suppress any defaults
"*.override,staff" "irc:#big-brother"; // report all uses of staff commands
- "ChanServ.*" "file:chanserv.log"; // duplicates the default behavior
+ "ChanServ.*" "file:/var/log/srvx/chanserv.log"; // duplicates the default behavior
"ProxyCheck.*" (); // stop it from logging anything
};
