From: Marcin Haba <marcin.haba@bacula.pl>
Date: Thu, 13 Nov 2014 22:39:55 +0000 (+0100)
Subject: baculum: Tweak deb metadata location
X-Git-Tag: Release-7.2.0~123
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cb435e90359d450226da57414f0d63838628a2fc;p=bacula%2Fbacula

baculum: Tweak deb metadata location
---

diff --git a/gui/baculum/debian/install b/gui/baculum/debian/install
index 48fec95df7..ce5349fecd 100644
--- a/gui/baculum/debian/install
+++ b/gui/baculum/debian/install
@@ -6,5 +6,5 @@ index.php  /var/www/baculum/
 LICENSE    /var/www/baculum/
 protected  /var/www/baculum/
 themes     /var/www/baculum/
-examples/baculum.users /var/www/baculum/protected/Data
-examples/baculum.lighttpd.conf /etc/baculum
+examples/deb/baculum.users /var/www/baculum/protected/Data
+examples/deb/baculum.lighttpd.conf /etc/baculum
diff --git a/gui/baculum/examples/baculum.lighttpd.conf b/gui/baculum/examples/baculum.lighttpd.conf
deleted file mode 100644
index cf90f16b0f..0000000000
--- a/gui/baculum/examples/baculum.lighttpd.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-# Baculum WebGUI tool for Bacula Community
-#
-# Web Server Configuration
-#
-
-server.port           = 9095
-server.username       = "www-data"
-server.groupname      = "www-data"
-server.document-root  = "/var/www/baculum"
-server.errorlog       = "/var/www/baculum/protected/logs/baculum-error.log"
-accesslog.filename    = "/var/www/baculum/protected/logs/baculum-access.log"
-server.pid-file       = "/var/run/baculum.pid"
-
-server.modules = (
-        "mod_auth",
-        "mod_rewrite",
-        "mod_fastcgi",
-        "mod_accesslog"
-)
-
-auth.backend          = "plain" 
-auth.backend.plain.userfile = "/var/www/baculum/protected/Data/baculum.users"
-auth.require = ( "/" => (
-        "method" => "basic",
-        "realm" => "Baculum Auth",
-        "require" => "valid-user"
-))
-
-index-file.names      = ( "index.php" )
-
-static-file.exclude-extensions = ( ".php" )
-
-dir-listing.encoding  = "utf-8"
-
-mimetype.assign = (
-   ".html" => "text/html",
-   ".gif" => "image/gif",
-   ".png" => "image/png",
-   ".ico" => "image/x-icon",
-   ".css" => "text/css",
-   ".js" => "application/javascript",
-)
-
-fastcgi.server = (".php"=>((
-  "bin-path"=>"/usr/bin/php5-cgi",
-  "socket"=>"/tmp/php.socket"
-)))
-
-url.rewrite-once = (
-   "^/themes/(.+)$" => "/themes/$1",
-   "^/assets/(.+)$" => "/assets/$1",
-   "^/(.+)$" => "/index.php/$1"
-)
diff --git a/gui/baculum/examples/baculum.users b/gui/baculum/examples/baculum.users
deleted file mode 100644
index 3663ae8502..0000000000
--- a/gui/baculum/examples/baculum.users
+++ /dev/null
@@ -1 +0,0 @@
-admin:admin
\ No newline at end of file
diff --git a/gui/baculum/examples/deb/baculum.lighttpd.conf b/gui/baculum/examples/deb/baculum.lighttpd.conf
new file mode 100644
index 0000000000..cf90f16b0f
--- /dev/null
+++ b/gui/baculum/examples/deb/baculum.lighttpd.conf
@@ -0,0 +1,53 @@
+# Baculum WebGUI tool for Bacula Community
+#
+# Web Server Configuration
+#
+
+server.port           = 9095
+server.username       = "www-data"
+server.groupname      = "www-data"
+server.document-root  = "/var/www/baculum"
+server.errorlog       = "/var/www/baculum/protected/logs/baculum-error.log"
+accesslog.filename    = "/var/www/baculum/protected/logs/baculum-access.log"
+server.pid-file       = "/var/run/baculum.pid"
+
+server.modules = (
+        "mod_auth",
+        "mod_rewrite",
+        "mod_fastcgi",
+        "mod_accesslog"
+)
+
+auth.backend          = "plain" 
+auth.backend.plain.userfile = "/var/www/baculum/protected/Data/baculum.users"
+auth.require = ( "/" => (
+        "method" => "basic",
+        "realm" => "Baculum Auth",
+        "require" => "valid-user"
+))
+
+index-file.names      = ( "index.php" )
+
+static-file.exclude-extensions = ( ".php" )
+
+dir-listing.encoding  = "utf-8"
+
+mimetype.assign = (
+   ".html" => "text/html",
+   ".gif" => "image/gif",
+   ".png" => "image/png",
+   ".ico" => "image/x-icon",
+   ".css" => "text/css",
+   ".js" => "application/javascript",
+)
+
+fastcgi.server = (".php"=>((
+  "bin-path"=>"/usr/bin/php5-cgi",
+  "socket"=>"/tmp/php.socket"
+)))
+
+url.rewrite-once = (
+   "^/themes/(.+)$" => "/themes/$1",
+   "^/assets/(.+)$" => "/assets/$1",
+   "^/(.+)$" => "/index.php/$1"
+)
diff --git a/gui/baculum/examples/deb/baculum.users b/gui/baculum/examples/deb/baculum.users
new file mode 100644
index 0000000000..3663ae8502
--- /dev/null
+++ b/gui/baculum/examples/deb/baculum.users
@@ -0,0 +1 @@
+admin:admin
\ No newline at end of file