Packaging, Documentation and Licenses

.gitignore

@@ -1 +1,4 @@
 composer.lock
+config.ini
+*.swp
+*.cache

LICENSE.txt → AGPL-3.0.txt

@@ -1,7 +1,7 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
+                    GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2013-2014 dass IT GmbH, Inc. <http://www.dass-it.de/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

Makefile.am

@@ -1,10 +1,12 @@
 install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
+	mkdir -p $(DESTDIR)/etc/bareos/bareos-dir.d/
+	mkdir -p $(DESTDIR)/etc/bareos-webui/
 
 	cp -pr init_autoloader.php config/ data/ module/ public/ vendor/ $(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@/
+	cp -p install/directors.ini $(DESTDIR)/etc/bareos-webui/directors.ini
+	$(INSTALL) -m 0640 install/bareos/bareos-webui.conf $(DESTDIR)/etc/bareos/bareos-dir.d/
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf $(DESTDIR)@HTTPD_CONF@/
 
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@

Makefile.in

@@ -77,8 +77,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) install-sh \
-	missing
+	$(top_srcdir)/configure $(am__configure_deps) AUTHORS \
+	install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -522,11 +522,13 @@ uninstall-am:
 install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
+	mkdir -p $(DESTDIR)/etc/bareos/bareos-dir.d/
+	mkdir -p $(DESTDIR)/etc/bareos-webui/
 
 	cp -pr init_autoloader.php config/ data/ module/ public/ vendor/ $(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@/
+	cp -p install/directors.ini $(DESTDIR)/etc/bareos-webui/directors.ini
+	$(INSTALL) -m 0640 install/bareos/bareos-webui.conf $(DESTDIR)/etc/bareos/bareos-dir.d/
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf $(DESTDIR)@HTTPD_CONF@/
 
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@
 

README.md

@@ -1,34 +1,28 @@
+
 Bareos WebUI
 ============
 
 A PHP-Frontend to manage [Bareos](http://www.bareos.org/) over the web.
 
-### SYSTEM REQUIREMENTS
-
-* A working Bareos Environment, Bareos 12.4 or later, including a Bareos catalog database
-* An Apache 2.x Webserver with mod-rewrite, mod-php5 and mod-setenvif enabled
-* PHP 5.3.3 or later; we recommend using the latest PHP version whenever possible
-* PHP PDO Extension
-* PHP intl Extension
-* PHP PHAR Extension (for development purposes)
-* PHP DATE Extension
-* PHP OpenSSL Extension (for development purposes)
-* Zend Framework 2.2.x
-* A Browser with JavaScript enabled
-
 ### INSTALLATION
 
-Please see [doc/install/INSTALL.md](doc/install/INSTALL.md).
+Please see [doc/INSTALL.md](doc/INSTALL.md).
 
 ### LICENSES
 
 The Bareos WebUI is licensed under AGPL Version 3.
-You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
+You can find a copy of this license in [AGPL-3.0.txt](AGPL-3.0.txt).
+
+Some other licenses are also involved by the use of external libraries
+and frameworks.
+
+* [Zend Framework 2 - BSD 3-Clause License](http://framework.zend.com/)
+* [Twitter Bootstrap - Apache License v2.0](http://getbootstrap.com/)
+* [jQuery - MIT License](http://jquery.com/)
+* [jqplot - dual licensed under MIT License and GPL Version 2 License](http://www.jqplot.com/)
+* [composer - MIT License](https://getcomposer.org/)
 
-* Zend Framework 2 - BSD 3-Clause License
-* Twitter Bootstrap - Apache License v2.0
-* jQuery - MIT License
-* jqplot - dual licensed under MIT License and GPL Version 2 License
+You can find a complete file listing in [LICENSE](LICENSE).
 
 ### BUGTRACKER
 

composer.json

@@ -9,6 +9,7 @@
     "homepage": "http://bareos.github.io/bareos-webui",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "2.2.*"
+        "zendframework/zendframework": "2.3.*",
+	"zendframework/zend-developer-tools": "dev-master"
     }
 }

config/application.config.php

@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2014 dass-IT GmbH (http://www.dass-it.de/)
+ * @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -46,13 +46,6 @@
 	'Auth',
 );
 
-/*
-if($env == 'development') {
-   $modules[] = 'ZendDeveloperTools';
-}
-*/
-
-// to display all errors use:
 
 if($env == 'development') {
         //$modules[] = 'ZendDeveloperTools';  // you may comment only this line out if ZendDeveloperTools are not installed e.g.

config/autoload/.gitignore

@@ -1,2 +0,0 @@
-local.php
-*.local.php