From 8eac7640a5f356563c0f629b72d31a9d3da5c13f Mon Sep 17 00:00:00 2001
From: Joerg Steffens <joerg.steffens@bareos.com>
Date: Wed, 5 Mar 2014 12:56:39 +0100
Subject: [PATCH] added file /etc/bareos-webui.conf.php

This file is used for custom configuration.
---
 Makefile.am                     | 12 +++---------
 Makefile.in                     | 12 +++---------
 config/autoload/local.php.dist  |  4 ++--
 packaging/obs/bareos-webui.spec |  3 +--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index da64c933..34e326e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,11 @@ install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
 	mkdir -p $(DESTDIR)@sysconfdir@/sudoers.d/
-#	dnl #mkdir -p $(DESTDIR)@sysconfdir@/@PACKAGE@
-#	dnl #mkdir -p $(DESTDIR)@sbindir@
-	cp -p init_autoloader.php $(DESTDIR)$(pkgdatadir)
-	cp -pr config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
 
-#	#mkdir -p $(DESTDIR)$(pkgdatadir)/install
+	cp -pr init_autoloader.php config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
+	cp -p  config/autoload/local.php.dist $(DESTDIR)/etc/bareos-webui.conf.php
+	ln -s  /etc/bareos-webui.conf.php $(DESTDIR)/$(pkgdatadir)/config/autoload/local.php
 	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
-
 	$(INSTALL) -m 0440 install/sudoers.d/bareos-webui-bconsole $(DESTDIR)@sysconfdir@/sudoers.d/
 
-#	#mv $(DESTDIR)$(pkgdatadir)/application/config.ini  $(DESTDIR)@sysconfdir@/@PACKAGE@/config.ini#
-#	#ln -s @sysconfdir@/@PACKAGE@/config.ini  $(DESTDIR)$(pkgdatadir)/application/config.ini
-
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@
diff --git a/Makefile.in b/Makefile.in
index 5ac78015..db31e8b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -482,19 +482,13 @@ install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
 	mkdir -p $(DESTDIR)@sysconfdir@/sudoers.d/
-#	dnl #mkdir -p $(DESTDIR)@sysconfdir@/@PACKAGE@
-#	dnl #mkdir -p $(DESTDIR)@sbindir@
-	cp -p init_autoloader.php $(DESTDIR)$(pkgdatadir)
-	cp -pr config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
 
-#	#mkdir -p $(DESTDIR)$(pkgdatadir)/install
+	cp -pr init_autoloader.php config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
+	cp -p  config/autoload/local.php.dist $(DESTDIR)/etc/bareos-webui.conf.php
+	ln -s  /etc/bareos-webui.conf.php $(DESTDIR)/$(pkgdatadir)/config/autoload/local.php
 	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
-
 	$(INSTALL) -m 0440 install/sudoers.d/bareos-webui-bconsole $(DESTDIR)@sysconfdir@/sudoers.d/
 
-#	#mv $(DESTDIR)$(pkgdatadir)/application/config.ini  $(DESTDIR)@sysconfdir@/@PACKAGE@/config.ini#
-#	#ln -s @sysconfdir@/@PACKAGE@/config.ini  $(DESTDIR)$(pkgdatadir)/application/config.ini
-
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index dedf2db6..0ca7cb64 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -2,7 +2,7 @@
 
 /**
  *
- * Barbossa - A Web-Frontend to manage Bareos
+ * bareos-webui - A Web-Frontend to manage Bareos
  * 
  * @link      http://github.com/fbergkemper/barbossa for the canonical source repository
  * @copyright Copyright (c) 2013-2014 dass-IT GmbH (http://www.dass-it.de/)
@@ -47,7 +47,7 @@ return array(
 		// Set your hostname here
 		'host' => 'localhost',
 		// Set your username here
-		'username' => 'bareos',
+		'username' => 'bareos_webui',
 		// Set your password here
 		'password' => '',
 
diff --git a/packaging/obs/bareos-webui.spec b/packaging/obs/bareos-webui.spec
index 6c1b4e40..3ce488ad 100644
--- a/packaging/obs/bareos-webui.spec
+++ b/packaging/obs/bareos-webui.spec
@@ -104,9 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/
 %{_datadir}/%{name}/
 #attr(-, #daemon_user, #daemon_group) #{_datadir}/#{name}/data
-#{_sysconfdir}/#{name}
+%config(noreplace) /etc/bareos-webui.conf.php
 %config(noreplace) %{_apache_conf_dir}/bareos-webui.conf
-#config(noreplace) #{_sysconfdir}/#{name}/config.ini
 #/usr/sbin/bareos-webui-config
 
 # /etc/sudoers.d/ should not belong to this package,