Attachment 192917 Details for Bug 227854 – add default config file and log rotation (via newsyslog) v2

[patch] add default config file and log rotation (via newsyslog) v2

urbackup-client-2.2.5_1.diff-1 (text/plain), 4.92 KB, created by freebsd on 2018-04-29 18:29:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: freebsd

Created: 2018-04-29 18:29:57 UTC

Size: 4.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 468640)
>+++ Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	urbackup-client
> DISTVERSION=	2.2.5
>+PORTREVISION=	1
> CATEGORIES=	archivers
> MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION}/
> 
>@@ -38,7 +39,7 @@
> .endif
> 
> USE_RC_SUBR=	urbackup_client
>-SUB_FILES=	pkg-message
>+SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
> 
> CONFFILES=	mariadbdump.conf \
> 		mariadbxtrabackup.conf \
>@@ -58,6 +59,7 @@
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/urbackup/scripts
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
> 	${MKDIR} ${STAGEDIR}/var/urbackup/data
>+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
> 
> 	${INSTALL_PROGRAM} ${WRKSRC}/urbackupclientctl \
> 		${STAGEDIR}${PREFIX}/bin
>@@ -68,6 +70,12 @@
> 	(cd ${WRKSRC}/urbackupclient/backup_scripts && 	${COPYTREE_BIN} . \
> 		${STAGEDIR}${PREFIX}/share/urbackup/scripts "! -name *\.conf")
> 
>+	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
>+		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample
>+
>+	${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf.sample-newsyslog \
>+		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf.sample
>+
> .for f in ${CONFFILES}
> 	${INSTALL_DATA} ${WRKSRC}/urbackupclient/backup_scripts/${f} \
> 		${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
>Index: files/urbackup_client.in
>===================================================================
>--- files/urbackup_client.in	(revision 468640)
>+++ files/urbackup_client.in	(working copy)
>@@ -25,6 +25,6 @@
> command=%%PREFIX%%/sbin/urbackupclientbackend
> pidfile=/var/run/urbackupclientbackend.pid
> 
>-command_args="-d -w $pidfile"
>+command_args="-d -w $pidfile -c %%PREFIX%%/etc/urbackup/urbackupclient.conf"
> 
> run_rc_command "$1"
>Index: files/urbackupclient.conf.sample-daemon.in
>===================================================================
>--- files/urbackupclient.conf.sample-daemon.in	(nonexistent)
>+++ files/urbackupclient.conf.sample-daemon.in	(working copy)
>@@ -0,0 +1,29 @@
>+#
>+# This is parsed as a key=value file
>+#
>+
>+#logfile name
>+#If you change the LOGFILE, you should also change the "logfilename" in %%PREFIX%%/etc/newsyslog.conf.d/urbackupclient.conf
>+LOGFILE="/var/log/urbackupclient.log"
>+
>+#Either debug,warn,info or error
>+LOGLEVEL=warn
>+
>+#Tmp file directory
>+DAEMON_TMPDIR="/tmp"
>+
>+# Valid settings:
>+#
>+# "client-confirms": If you have the GUI component the currently active user
>+#                    will need to confirm restores from the web interface.
>+#                    If you have no GUI component this will cause restores
>+#                    from the server web interface to not work
>+# "server-confirms": The server will ask the user starting the restore on 
>+#                    the web interface for confirmation
>+# "disabled":        Restores via web interface are disabled.
>+#                    Restores via urbackupclientctl still work
>+#
>+RESTORE=disabled
>+
>+#If true client will not bind to any external network ports (either true or false)
>+INTERNET_ONLY=false
>
>Property changes on: files/urbackupclient.conf.sample-daemon.in
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/urbackupclient.conf.sample-newsyslog
>===================================================================
>--- files/urbackupclient.conf.sample-newsyslog	(nonexistent)
>+++ files/urbackupclient.conf.sample-newsyslog	(working copy)
>@@ -0,0 +1,2 @@
>+# logfilename			[owner:group]	mode	count	size(kb)	when	flags	[/pid_file]				[sig_num]
>+/var/log/urbackupclient.log	root:wheel	644  	10	5120		*	JC	/var/run/urbackupclientbackend.pid
>
>Property changes on: files/urbackupclient.conf.sample-newsyslog
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 468640)
>+++ pkg-plist	(working copy)
>@@ -2,11 +2,12 @@
> %%GUI%%bin/urbackupclientgui
> sbin/urbackupclientbackend
> @(,,0444) man/man1/urbackupclientbackend.1.gz
>-@mode 0700
>+@mode 0600
> @sample etc/urbackup/mariadbdump.conf.sample
> @sample etc/urbackup/mariadbxtrabackup.conf.sample
> @sample etc/urbackup/postgresbase.conf.sample
> @sample etc/urbackup/postgresqldump.conf.sample
>+@mode 0700
> share/urbackup/scripts/list
> share/urbackup/scripts/mariadbdump
> share/urbackup/scripts/mariadbpostbackup
>@@ -20,6 +21,8 @@
> share/urbackup/scripts/setup-mariadbbackup
> share/urbackup/scripts/setup-postgresbackup
> @mode 0644
>+@sample etc/urbackup/urbackupclient.conf.sample
>+@sample etc/newsyslog.conf.d/urbackupclient.conf.sample
> share/urbackup/updates_h.dat
> %%GUI%%share/urbackup/info.txt
> %%GUI%%share/urbackup/logo1.png

Actions: View | Diff

Attachments on bug 227854: 192912 | 192917 | 195921 | 196020