adapted to new project name bareos-webui

Makefile.am

@@ -7,11 +7,11 @@ install: install-am
 	cp -pr config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
 
 #	#mkdir -p $(DESTDIR)$(pkgdatadir)/install
-	$(INSTALL) -m 0640 install/apache/bareos-console-web.conf  $(DESTDIR)@HTTPD_CONF@/bareos-console-web.conf
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
 
-	$(INSTALL) -m 0440 install/sudoers.d/bareos-console-web-bconsole $(DESTDIR)@sysconfdir@/sudoers.d/
+	$(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/webacula-config $(DESTDIR)@sbindir@
+#	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@

Makefile.in

@@ -487,14 +487,14 @@ install: install-am
 	cp -pr config/ data/ module/ public/ $(DESTDIR)$(pkgdatadir)
 
 #	#mkdir -p $(DESTDIR)$(pkgdatadir)/install
-	$(INSTALL) -m 0640 install/apache/bareos-console-web.conf  $(DESTDIR)@HTTPD_CONF@/bareos-console-web.conf
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
 
-	$(INSTALL) -m 0440 install/sudoers.d/bareos-console-web-bconsole $(DESTDIR)@sysconfdir@/sudoers.d/
+	$(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/webacula-config $(DESTDIR)@sbindir@
+#	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

README.md

@@ -1,17 +1,13 @@
-Bareos Web-Frontend
-===================
+Bareos WebUI
+============
 
-[![Build Status](https://travis-ci.org/fbergkemper/barbossa.png?branch=master)](https://travis-ci.org/fbergkemper/barbossa)
+[![Build Status](https://travis-ci.org/bareos/bareos-webui.png?branch=master)](https://travis-ci.org/bareos/bareos-webui)
 
 A PHP-Frontend to manage [Bareos](http://www.bareos.org/) over the web.
 
 For a feature list and a few screenshots from alpha, please take a look 
 at the [Project Homepage](http://fbergkemper.github.io/).
 
-### RELEASES
-
-[Bareos Web-Frontend v0.0.1-alpha](https://github.com/fbergkemper/barbossa/releases/tag/v0.0.1-alpha)
-
 ### SYSTEM REQUIREMENTS
 
 * A working Bareos Environment, Bareos 12.4 or later, including a Bareos catalog database (Currently only PostgreSQL is supported by the Web-Frontend, MySQL should be in near future.)
@@ -31,11 +27,10 @@ Please see [doc/install/INSTALL.md](doc/install/INSTALL.md).
 
 ### LICENSES
 
-The Bareos Web-Frontend is licensed under AGPL Version 3. 
+The Bareos WebUI is licensed under AGPL Version 3. 
 You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
 
 * 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
-

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for bareos-console-web 0.1.
+# Generated by GNU Autoconf 2.69 for bareos-webui 0.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -574,10 +574,10 @@ MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
-PACKAGE_NAME='bareos-console-web'
-PACKAGE_TARNAME='bareos-console-web'
+PACKAGE_NAME='bareos-webui'
+PACKAGE_TARNAME='bareos-webui'
 PACKAGE_VERSION='0.1'
-PACKAGE_STRING='bareos-console-web 0.1'
+PACKAGE_STRING='bareos-webui 0.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1196,7 +1196,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures bareos-console-web 0.1 to adapt to many kinds of systems.
+\`configure' configures bareos-webui 0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1244,8 +1244,7 @@ Fine tuning of the installation directories:
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root
-                          [DATAROOTDIR/doc/bareos-console-web]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/bareos-webui]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1263,7 +1262,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of bareos-console-web 0.1:";;
+     short | recursive ) echo "Configuration of bareos-webui 0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1336,7 +1335,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-bareos-console-web configure 0.1
+bareos-webui configure 0.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1353,7 +1352,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by bareos-console-web $as_me 0.1, which was
+It was created by bareos-webui $as_me 0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2176,7 +2175,7 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE='bareos-console-web'
+ PACKAGE='bareos-webui'
  VERSION='0.1'
 
 
@@ -2844,7 +2843,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by bareos-console-web $as_me 0.1, which was
+This file was extended by bareos-webui $as_me 0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2897,7 +2896,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-bareos-console-web config.status 0.1
+bareos-webui config.status 0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([bareos-console-web], [0.1])
+AC_INIT([bareos-webui], [0.1])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 
 AC_PATH_PROGS( [APXS], [apxs apxs2], [apxs2], [$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])

debian/control

@@ -1,4 +1,4 @@
-Source: bareos-console-web
+Source: bareos-webui
 Section: web
 Priority: extra
 Maintainer: Bareos Packager <packager@bareos.org>
@@ -7,13 +7,13 @@ Build-Depends: debhelper (>= 7.0.50~),
   autoconf,
   automake
 Standards-Version: 3.9.1
-#Homepage: <insert the upstream URL, if relevant>
-Vcs-Git: git://github.com/bareos/contrib-webacula.git
-Vcs-Browser: https://github.com/bareos/contrib-webacula.git
+Homepage: https://github.com/bareos/bareos-webui
+Vcs-Git: git://github.com/bareos/bareos-webui.git
+Vcs-Browser: https://github.com/bareos/bareos-webui.git
 
-Package: bareos-console-web
+Package: bareos-webui
 Architecture: all
 Depends: apache2 | httpd, libapache2-mod-php5 | php5 | php5-cgi, php5-cli, php5-gd, php5-json, php5-mysql | php5-pgsql | php5-sqlite3, zendframework, ${misc:Depends}
 Recommends: sudo
-Description: Barbossa - Bareos webinterface.
- Webinterface for Bareos.
+Description: Bareos Web User Interface.
+ Webinterface for the Bareos backup system.

debian/copyright

@@ -1,10 +1,10 @@
 This work was packaged for Debian by:
 
-    Jörg Steffens <joerg.steffens@bareos.org> on Fri, 14 Feb 2014 16:52:57 +0100
+    Jörg Steffens <joerg.steffens@bareos.org> on Fri, 14 Feb 2014 10:52:57 +0100
 
 It was downloaded from:
 
-    https://github.com/bareos/bareos-console-web
+    https://github.com/bareos/bareos-webui
 
 Upstream Author(s):
 
@@ -17,11 +17,3 @@ Copyright:
 License:
 
     AGPL-3+
-
-The Debian packaging is:
-
-    Copyright (C) 2014 Joerg Steffens <joerg.steffens@bareos.org>
-
-and is licensed under the AGPL version 3,
-see "/usr/share/common-licenses/AGPL-3".
-

install/apache/bareos-console-web.conf → install/apache/bareos-webui.conf

@@ -1,11 +1,10 @@
 #
-# bareos.conf
+# Bareos WebUI Apache configuration file
 #
-# Bareos Web-Frontend Apache configuration file
-# Allows only localhost by default
+# by default, allows only access from localhost
 #
 
-LoadModule rewrite_module modules/mod_rewrite.so
+#LoadModule rewrite_module modules/mod_rewrite.so
 
 # AccessFileName .htaccess
 # RewriteLog "/var/log/httpd/mod_rewrite.log"
@@ -14,11 +13,11 @@ LoadModule rewrite_module modules/mod_rewrite.so
 SetEnv "APP_ENV" "development"
 #SetEnv "APP_ENV" "production"
 
-Alias /barbossa  /srv/www/htdocs/barbossa/public
-<Directory /srv/www/htdocs/barbossa/public>
+Alias /bareos-webui  /usr/share/bareos-webui/public
+<Directory /usr/share/bareos-webui/public>
    RewriteEngine On
 
-   RewriteBase   /barbossa
+   RewriteBase   /bareos-webui
    RewriteCond %{REQUEST_FILENAME} -s [OR]
    RewriteCond %{REQUEST_FILENAME} -l [OR]
    RewriteCond %{REQUEST_FILENAME} -d

install/sudoers.d/bareos-console-web-bconsole → install/sudoers.d/bareos-webui-bconsole

@@ -1,4 +1,4 @@
-# allow apache to run bconsole. required for bareos-console-web/barbossa
-Cmnd_Alias BCONSOLE = /usr/sbin/bconsole -n -c /etc/bareos/bconsole.conf, /usr/sbin/bconsole -n -c /etc/bareos/console-web/bconsole.conf
+# allow apache to run bconsole. required for bareos-webui
+Cmnd_Alias BCONSOLE = /usr/sbin/bconsole -n -c /etc/bareos/bconsole.conf, /usr/sbin/bconsole -n -c /etc/bareos/webui/bconsole.conf
 Defaults!BCONSOLE !requiretty
 wwwrun,www-data,apache ALL=(root) NOPASSWD: BCONSOLE

packaging/obs/bareos-webui.changes

@@ -0,0 +1,5 @@
+bareos-webui (0.1-1) unstable; urgency=low
+
+  * initial packaging
+
+ -- Joerg Steffens <joerg.steffens@bareos.com>  Fri, 14 Feb 2014 11:52:57 +0100

packaging/obs/bareos-console-web.dsc → packaging/obs/bareos-webui.dsc

@@ -1,12 +1,12 @@
 Format: 1.0
-Source: bareos-console-web
-Binary: bareos-console-web
+Source: bareos-webui
+Binary: bareos-webui
 Architecture: all
 Version: 0.1
 Maintainer: Bareos Packager <packager@bareos.org>
 Standards-Version: 3.9.1
-Vcs-Browser: https://github.com/bareos/contrib-webacula.git
-Vcs-Git: git://github.com/bareos/contrib-webacula.git
+Vcs-Browser: https://github.com/bareos/bareos-webui.git
+Vcs-Git: git://github.com/bareos/bareos-webui.git
 Build-Depends: debhelper (>= 7.0.50~), apache2-dev | apache2-prefork-dev, autoconf, automake
 DEBTRANSFORM-RELEASE: 1
 Files:

packaging/obs/bareos-console-web.spec → packaging/obs/bareos-webui.spec

@@ -1,16 +1,17 @@
 
-Name:          bareos-console-web
+Name:          bareos-webui
+Provides:      bareos-console-web
 Provides:      barrossa
 Version:       0.1
 Release:       0%{?dist}
-Summary:       Web interface of a Bareos backup system
+Summary:       Bareos Web User Interface
 
-Group:      Productivity/Archiving/Backup
-License:    AGPL-3.0+
-#URL:        http://webacula.sourceforge.net/
-Source:     %{name}_%{version}.tar.gz
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-BuildArch:  noarch
+Group:         Productivity/Archiving/Backup
+License:       AGPL-3.0+
+URL:           https://github.com/bareos/bareos-webui
+Source:        %{name}_%{version}.tar.gz
+BuildRoot:     %{_tmppath}/%{name}-%{version}-build
+BuildArch:     noarch
 
 BuildRequires: autoconf automake
 BuildRequires: sudo
@@ -62,7 +63,7 @@ Requires:   php-pgsql php-mysql
 #define serverroot #(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX)/htdocs/
 
 %description
-Barbossa - web interface of a Bareos backup system.
+Bareos Web User Interface.
 Supports status overview about Jobs.
 
 %prep
@@ -84,14 +85,14 @@ make DESTDIR=%{buildroot} install
 %post
 # if command a2enmod exists, 
 # use it to enable Apache rewrite module
-LOG=/var/log/bareos-console-web-install.log
-echo "`date`: BEGIN bareos-console-web init" >> $LOG
+LOG=/var/log/bareos-webui-install.log
+echo "`date`: BEGIN bareos-webui init" >> $LOG
 which a2enmod >/dev/null && a2enmod rewrite >> $LOG 2>&1
-export WEBACULA_INTERACTIVE="no"
-# if /usr/sbin/webacula-config init >> $LOG 2>&1; then
-#     echo "SUCCESS: webacula-config init, see $LOG"
+export BAREOS_WEBUI_INTERACTIVE="no"
+# if /usr/sbin/bareos-webui-config init >> $LOG 2>&1; then
+#     echo "SUCCESS: bareos-webui-config init, see $LOG"
 # else
-#     echo "FAILED: webacula-config init, see $LOG"
+#     echo "FAILED: bareos-webui-config init, see $LOG"
 # fi
 
 %clean
@@ -104,12 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/
 #attr(-, #daemon_user, #daemon_group) #{_datadir}/#{name}/data
 #{_sysconfdir}/#{name}
-%config(noreplace) %{_apache_conf_dir}/bareos-console-web.conf
+%config(noreplace) %{_apache_conf_dir}/bareos-webui.conf
 #config(noreplace) #{_sysconfdir}/#{name}/config.ini
-#/usr/sbin/webacula-config
+#/usr/sbin/bareos-webui-config
 
 # /etc/sudoers.d/ should not belong to this package,
 # but is does currently not exist on most distributions
-dir /etc/sudoers.d/
+%dir /etc/sudoers.d/
 # sudo requires permissions 440 and config files without any "."
-%attr(440,root,root) %config(noreplace) /etc/sudoers.d/bareos-console-web-bconsole
+%attr(440,root,root) %config(noreplace) /etc/sudoers.d/bareos-webui-bconsole