[debian-edu-commits] debian-edu/ 01/01: Provide slbackup-php configuration file etc/slbackup-php/config.php. Without a proper configuration the backupserver default 'localhost' leads to errors if 'https://backup/slbackup-php' isn't called on the backupserver. (Previously the default was 'backup'; it was changed to 'localhost' some time ago to make the package useable on vanilla Debian systems, but a config file for Debian Edu wasn't provided.)

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-config.

commit 24223bbff369d30cb2c090f1ae0cf96065c3fa24
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Nov 16 16:52:08 2014 +0100

    Provide slbackup-php configuration file etc/slbackup-php/config.php.
    Without a proper configuration the backupserver default 'localhost'
    leads to errors if 'https://backup/slbackup-php' isn't called on the
    backupserver. (Previously the default was 'backup'; it was changed to
    'localhost' some time ago to make the package useable on vanilla
    Debian systems, but a config file for Debian Edu wasn't provided.)
---
 Makefile                    | 2 ++
 debian/changelog            | 6 ++++++
 debian/dirs                 | 1 +
 etc/slbackup-php/config.php | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/Makefile b/Makefile
index b5a1c04..24d5eb3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ docdir     = $(prefix)/share/doc/$(PACKAGE)
 mandir     = $(prefix)/share/man
 gosadir    = $(sysconfdir)/gosa
 ldapdir    = $(sysconfdir)/ldap
+slbackupphpdir = $(sysconfdir)/slbackup-php
 schemadir  = $(ldapdir)/schema
 dhcpdir   = $(sysconfdir)/dhcp
 libdir     = /usr/lib
@@ -145,6 +146,7 @@ SYSCONFFILES = \
 	samba/samba-domain-policy.ldif \
 	security/pam_mount-winbind-debian-edu.conf \
 	security/pam_mount-stateless-debian-edu.conf \
+	slbackup-php/config.php \
 	smbldap-tools/smbldap_bind.conf \
 	smbldap-tools/smbldap.conf \
 	sssd/sssd-debian-edu.conf \
diff --git a/debian/changelog b/debian/changelog
index 27e6ba5..465dfb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,12 @@ debian-edu-config (1.814) UNRELEASED; urgency=low
   [ Wolfgang Schweer ]
   * testsuite/network: cover case that udev persistent network card rules
     file isn't written at all.
+  * Provide slbackup-php configuration file etc/slbackup-php/config.php.
+    Without a proper configuration the backupserver default 'localhost'
+    leads to errors if 'https://backup/slbackup-php' isn't called on the
+    backupserver. (Previously the default was 'backup'; it was changed to
+    'localhost' some time ago to make the package useable on vanilla
+    Debian systems, but a config file for Debian Edu wasn't provided.)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 01 Nov 2014 07:25:41 +0100
 
diff --git a/debian/dirs b/debian/dirs
index 7a8dec4..a29294c 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -17,6 +17,7 @@ etc/slbackup/pre.d
 etc/samba
 etc/samba/netlogon
 etc/slbackup/pre.d
+etc/slbackup-php
 etc/skel/.local/share
 etc/X11/Xsession.d
 usr/bin
diff --git a/etc/slbackup-php/config.php b/etc/slbackup-php/config.php
new file mode 100644
index 0000000..f72c8ce
--- /dev/null
+++ b/etc/slbackup-php/config.php
@@ -0,0 +1,4 @@
+<?php
+$backuphost = 'backup';
+$backupuser = 'root';
+?>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git