Attachment #38239 for bug #40979




# - "pass" : db password                                                     #
#                                                                            #
# Examples:                                                                  #
# storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain
# storage_path = cdb:dir=%statedir%/userscdb;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.cdb
# storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0
# storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0
#----------------------------------------------------------------------------#

storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain

#                                                                            #
##############################################################################

# Use absolute paths in these lines to avoid problems!                       #
#----------------------------------------------------------------------------#

filedir     = %datadir%
reportdir   = %statedir%/reports
chanlogdir  = %statedir%/chanlogs
motdfile    = %confdir%/bnmotd.txt
issuefile   = %confdir%/bnissue.txt
channelfile = %confdir%/channel.conf
newsfile    = %confdir%/news.txt
adfile      = %confdir%/ad.conf
topicfile   = %confdir%/topics.conf
ipbanfile   = %confdir%/bnban.conf
helpfile    = %confdir%/bnhelp.conf
transfile   = %confdir%/gametrans.conf
mpqfile     = %confdir%/autoupdate.conf
logfile     = %logdir%/bnetd.log
realmfile   = %confdir%/realm.conf
maildir     = %statedir%/bnmail
versioncheck_file = %confdir%/versioncheck.conf
mapsfile    = %confdir%/bnmaps.conf
xplevelfile = %confdir%/bnxplevel.conf
xpcalcfile  = %confdir%/bnxpcalc.conf
#pidfile    = /usr/local/var/bnetd.pid
ladderdir   = %statedir%/ladders
command_groups_file = %confdir%/command_groups.conf
tournament_file = %confdir%/tournament.conf
statusdir   = %statedir%/status
aliasfile   = %confdir%/bnalias.conf
w3trans_file = %confdir%/w3trans.conf
anongame_infos_file = %confdir%/anongame_infos.conf
DBlayoutfile = %confdir%/sql_DB_layout.conf
supportfile = %confdir%/supportfile.conf

fortunecmd  = /usr/games/fortune





# Use absolute paths in these lines to avoid problems!				#
#-------------------------------------------------------------------------------#
#										#
logfile			=	%logdir%/d2cs.log
charsavedir		=	%statedir%/charsave
charinfodir		=	%statedir%/charinfo
ladderdir		=	%statedir%/ladders
newbiefile		=	%datadir%/files/newbie.save
d2gstransfile		=	%confdir%/d2gstrans.conf
d2gsconffile		=	%confdir%/d2server.ini
#										#
#################################################################################





# File and Path section								#
# Use absolute paths in these lines to avoid problems!				#
#-------------------------------------------------------------------------------#
logfile		=	%logdir%/d2dbs.log
logfile-gs	=	%logdir%/d2dbs-gs.log
charsavedir	=	%statedir%/charsave
charinfodir	=	%statedir%/charinfo
ladderdir	=	%statedir%/ladders
bak_charsavedir	=	%statedir%/bak/charsave
bak_charinfodir	=	%statedir%/bak/charinfo
#										#
#################################################################################





bindir		= @bindir@
sbindir		= @sbindir@
mandir		= @mandir@
confdir		= @sysconfdir@/pvpgn
statedir	= @localstatedir@/pvpgn
filesdir	= @datadir@/pvpgn
usersdir	= @localstatedir@/pvpgn/users
userscdbdir	= @localstatedir@/pvpgn/userscdb
clandir		= @localstatedir@/pvpgn/clans
bnmaildir	= @localstatedir@/pvpgn/bnmail
reportsdir	= @localstatedir@/pvpgn/reports
chanlogsdir	= @localstatedir@/pvpgn/chanlogs
charinfodir     = @localstatedir@/pvpgn/charinfo
charsavedir     = @localstatedir@/pvpgn/charsave
ladderdir       = @localstatedir@/pvpgn/ladders
statusdir       = @localstatedir@/pvpgn/status
bak_charsavedir = @localstatedir@/pvpgn/bak/charsave
bak_charinfodir = @localstatedir@/pvpgn/bak/charinfo
logdir		= @localstatedir@/pvpgn/log

SRC_SRCDIR	= @srcdir@
SRC_BINDIR	= @srcdir@/../bin


.PHONY: install-share
install-share:
	${INSTALL_DIRS} ${DESTDIR}/${datadir} ${DESTDIR}/${statedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
	${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \
	${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} ${DESTDIR}/${clandir}
	@list='${SHARES}'; for p in $$list; do \

.PHONY: uninstall-share
uninstall-share:
	@list='${SHARES}'; for p in $$list; do \
	  ${ECHO} "  ${RMF} ${filesdir}/$$p"; \
	  ${RMF} ${filesdir}/$$p; \
	done

${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status
	@${RMF} $@
	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/bnetd.conf.in > $@

${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status
	@${RMF} $@
	${SED} -e "s@\(=[[:blank:]]*\"*\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]*\"*\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@

${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status
	@${RMF} $@
	${SED} -e "s@\(=[[:blank:]]*\"*\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]*\"*\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]*\"*\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@

${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o
	@${RMF} $@

Return to bug 40979

Lines 46-58 Link Here

(-)../pvpgn-1.6.4/conf/bnetd.conf.in (-32 / +32 lines)
46	# - "pass" : db password #	46	# - "pass" : db password #
47	# #	47	# #
48	# Examples: #	48	# Examples: #
49	# storage_path = file:dir=/usr/local/var/users;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.plain	49	# storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain
50	# storage_path = cdb:dir=/usr/local/var/userscdb;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.cdb	50	# storage_path = cdb:dir=%statedir%/userscdb;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.cdb
51	# storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0	51	# storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0
52	# storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0	52	# storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0
53	#----------------------------------------------------------------------------#	53	#----------------------------------------------------------------------------#
54		54
55	storage_path = file:dir=/usr/local/var/users;clan=/usr/local/var/clans;default=/usr/local/etc/bnetd_default_user.plain	55	storage_path = file:dir=%statedir%/users;clan=%statedir%/clans;default=%confdir%/bnetd_default_user.plain
56		56
57	# #	57	# #
58	##############################################################################	58	##############################################################################
Lines 63-98 Link Here
63	# Use absolute paths in these lines to avoid problems! #	63	# Use absolute paths in these lines to avoid problems! #
64	#----------------------------------------------------------------------------#	64	#----------------------------------------------------------------------------#
65		65
66	filedir = /usr/local/var/files	66	filedir = %datadir%
67	reportdir = /usr/local/var/reports	67	reportdir = %statedir%/reports
68	chanlogdir = /usr/local/var/chanlogs	68	chanlogdir = %statedir%/chanlogs
69	motdfile = /usr/local/etc/bnmotd.txt	69	motdfile = %confdir%/bnmotd.txt
70	issuefile = /usr/local/etc/bnissue.txt	70	issuefile = %confdir%/bnissue.txt
71	channelfile = /usr/local/etc/channel.conf	71	channelfile = %confdir%/channel.conf
72	newsfile = /usr/local/etc/news.txt	72	newsfile = %confdir%/news.txt
73	adfile = /usr/local/etc/ad.conf	73	adfile = %confdir%/ad.conf
74	topicfile = /usr/local/etc/topics.conf	74	topicfile = %confdir%/topics.conf
75	ipbanfile = /usr/local/etc/bnban.conf	75	ipbanfile = %confdir%/bnban.conf
76	helpfile = /usr/local/etc/bnhelp.conf	76	helpfile = %confdir%/bnhelp.conf
77	transfile = /usr/local/etc/gametrans.conf	77	transfile = %confdir%/gametrans.conf
78	mpqfile = /usr/local/etc/autoupdate.conf	78	mpqfile = %confdir%/autoupdate.conf
79	logfile = /usr/local/var/bnetd.log	79	logfile = %logdir%/bnetd.log
80	realmfile = /usr/local/etc/realm.conf	80	realmfile = %confdir%/realm.conf
81	maildir = /usr/local/var/bnmail	81	maildir = %statedir%/bnmail
82	versioncheck_file = /usr/local/etc/versioncheck.conf	82	versioncheck_file = %confdir%/versioncheck.conf
83	mapsfile = /usr/local/etc/bnmaps.conf	83	mapsfile = %confdir%/bnmaps.conf
84	xplevelfile = /usr/local/etc/bnxplevel.conf	84	xplevelfile = %confdir%/bnxplevel.conf
85	xpcalcfile = /usr/local/etc/bnxpcalc.conf	85	xpcalcfile = %confdir%/bnxpcalc.conf
86	#pidfile = /usr/local/var/bnetd.pid	86	#pidfile = /usr/local/var/bnetd.pid
87	ladderdir = /usr/local/var/ladders	87	ladderdir = %statedir%/ladders
88	command_groups_file = /usr/local/etc/command_groups.conf	88	command_groups_file = %confdir%/command_groups.conf
89	tournament_file = /usr/local/etc/tournament.conf	89	tournament_file = %confdir%/tournament.conf
90	statusdir = /usr/local/var/status	90	statusdir = %statedir%/status
91	aliasfile = /usr/local/etc/bnalias.conf	91	aliasfile = %confdir%/bnalias.conf
92	w3trans_file = /usr/local/etc/w3trans.conf	92	w3trans_file = %confdir%/w3trans.conf
93	anongame_infos_file = /usr/local/etc/anongame_infos.conf	93	anongame_infos_file = %confdir%/anongame_infos.conf
94	DBlayoutfile = /usr/local/etc/sql_DB_layout.conf	94	DBlayoutfile = %confdir%/sql_DB_layout.conf
95	supportfile = /usr/local/etc/supportfile.conf	95	supportfile = %confdir%/supportfile.conf
96		96
97	fortunecmd = /usr/games/fortune	97	fortunecmd = /usr/games/fortune
98		98

Lines 79-91 Link Here

(-)../pvpgn-1.6.4/conf/d2cs.conf.in (-7 / +7 lines)
79	# Use absolute paths in these lines to avoid problems! #	79	# Use absolute paths in these lines to avoid problems! #
80	#-------------------------------------------------------------------------------#	80	#-------------------------------------------------------------------------------#
81	# #	81	# #
82	logfile = /usr/local/var/d2cs.log	82	logfile = %logdir%/d2cs.log
83	charsavedir = /usr/local/var/charsave	83	charsavedir = %statedir%/charsave
84	charinfodir = /usr/local/var/charinfo	84	charinfodir = %statedir%/charinfo
85	ladderdir = /usr/local/var/ladders	85	ladderdir = %statedir%/ladders
86	newbiefile = /usr/local/var/files/newbie.save	86	newbiefile = %datadir%/files/newbie.save
87	d2gstransfile = /usr/local/etc/d2gstrans.conf	87	d2gstransfile = %confdir%/d2gstrans.conf
88	d2gsconffile = /usr/local/etc/d2server.ini	88	d2gsconffile = %confdir%/d2server.ini
89	# #	89	# #
90	#################################################################################	90	#################################################################################
91		91

Lines 47-59 Link Here

(-)../pvpgn-1.6.4/conf/d2dbs.conf.in (-7 / +7 lines)
47	# File and Path section #	47	# File and Path section #
48	# Use absolute paths in these lines to avoid problems! #	48	# Use absolute paths in these lines to avoid problems! #
49	#-------------------------------------------------------------------------------#	49	#-------------------------------------------------------------------------------#
50	logfile = /usr/local/var/d2dbs.log	50	logfile = %logdir%/d2dbs.log
51	logfile-gs = /usr/local/var/d2dbs-gs.log	51	logfile-gs = %logdir%/d2dbs-gs.log
52	charsavedir = /usr/local/var/charsave	52	charsavedir = %statedir%/charsave
53	charinfodir = /usr/local/var/charinfo	53	charinfodir = %statedir%/charinfo
54	ladderdir = /usr/local/var/ladders	54	ladderdir = %statedir%/ladders
55	bak_charsavedir = /usr/local/var/bak/charsave	55	bak_charsavedir = %statedir%/bak/charsave
56	bak_charinfodir = /usr/local/var/bak/charinfo	56	bak_charinfodir = %statedir%/bak/charinfo
57	# #	57	# #
58	#################################################################################	58	#################################################################################
59		59

Lines 23-43 Link Here

(-)../pvpgn-1.6.4/src/Makefile.in (-21 / +22 lines)
23	bindir = @bindir@	23	bindir = @bindir@
24	sbindir = @sbindir@	24	sbindir = @sbindir@
25	mandir = @mandir@	25	mandir = @mandir@
26	confdir = @sysconfdir@	26	confdir = @sysconfdir@/pvpgn
27	sharedir = @localstatedir@	27	statedir = @localstatedir@/pvpgn
28	filesdir = @localstatedir@/files	28	filesdir = @datadir@/pvpgn
29	usersdir = @localstatedir@/users	29	usersdir = @localstatedir@/pvpgn/users
30	userscdbdir = @localstatedir@/userscdb	30	userscdbdir = @localstatedir@/pvpgn/userscdb
31	clandir = @localstatedir@/clans	31	clandir = @localstatedir@/pvpgn/clans
32	bnmaildir = @localstatedir@/bnmail	32	bnmaildir = @localstatedir@/pvpgn/bnmail
33	reportsdir = @localstatedir@/reports	33	reportsdir = @localstatedir@/pvpgn/reports
34	chanlogsdir = @localstatedir@/chanlogs	34	chanlogsdir = @localstatedir@/pvpgn/chanlogs
35	charinfodir = @localstatedir@/charinfo	35	charinfodir = @localstatedir@/pvpgn/charinfo
36	charsavedir = @localstatedir@/charsave	36	charsavedir = @localstatedir@/pvpgn/charsave
37	ladderdir = @localstatedir@/ladders	37	ladderdir = @localstatedir@/pvpgn/ladders
38	statusdir = @localstatedir@/status	38	statusdir = @localstatedir@/pvpgn/status
39	bak_charsavedir = @localstatedir@/bak/charsave	39	bak_charsavedir = @localstatedir@/pvpgn/bak/charsave
40	bak_charinfodir = @localstatedir@/bak/charinfo	40	bak_charinfodir = @localstatedir@/pvpgn/bak/charinfo
		41	logdir = @localstatedir@/pvpgn/log
41		42
42	SRC_SRCDIR = @srcdir@	43	SRC_SRCDIR = @srcdir@
43	SRC_BINDIR = @srcdir@/../bin	44	SRC_BINDIR = @srcdir@/../bin
Lines 630-636 Link Here
630		631
631	.PHONY: install-share	632	.PHONY: install-share
632	install-share:	633	install-share:
633	${INSTALL_DIRS} ${DESTDIR}/${sharedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \	634	${INSTALL_DIRS} ${DESTDIR}/${datadir} ${DESTDIR}/${statedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
634	${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \	635	${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \
635	${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} ${DESTDIR}/${clandir}	636	${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} ${DESTDIR}/${clandir}
636	@list='${SHARES}'; for p in $$list; do \	637	@list='${SHARES}'; for p in $$list; do \
Lines 680-700 Link Here
680	.PHONY: uninstall-share	681	.PHONY: uninstall-share
681	uninstall-share:	682	uninstall-share:
682	@list='${SHARES}'; for p in $$list; do \	683	@list='${SHARES}'; for p in $$list; do \
683	${ECHO} " ${RMF} ${sharedir}/$$p"; \	684	${ECHO} " ${RMF} ${filesdir}/$$p"; \
684	${RMF} ${sharedir}/$$p; \	685	${RMF} ${filesdir}/$$p; \
685	done	686	done
686		687
687	${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status	688	${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status
688	@${RMF} $@	689	@${RMF} $@
689	${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/bnetd.conf.in > $@	690	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/bnetd.conf.in > $@
690		691
691	${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status	692	${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status
692	@${RMF} $@	693	@${RMF} $@
693	${SED} -e "s@\(=[[:blank:]]\"\)/usr/local/var/@\1${sharedir}/@g" -e "s@\(=[[:blank:]]\"\)/usr/local/etc/@\1${confdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@	694	${SED} -e "s@\(=[[:blank:]]\"\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]\"\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]\"\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]\"\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@
694		695
695	${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status	696	${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status
696	@${RMF} $@	697	@${RMF} $@
697	${SED} -e "s@\(=[[:blank:]]\"\)/usr/local/var/@\1${sharedir}/@g" -e "s@\(=[[:blank:]]\"\)/usr/local/etc/@\1${confdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@	698	${SED} -e "s@\(=[[:blank:]]\"\)%datadir%@\1${filesdir}/@g" -e "s@\(=[[:blank:]]\"\)%confdir%@\1${confdir}/@g" -e "s@\(=[[:blank:]]\"\)%statedir%@\1${statedir}/@g" -e "s@\(=[[:blank:]]\"\)%logdir%@\1${logdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@
698		699
699	${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o	700	${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o
700	@${RMF} $@	701	@${RMF} $@