From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sat, 7 Dec 2019 14:28:37 +0000 (+0100)
Subject: baculum: Tweak improve web server files permissions
X-Git-Tag: Release-9.6.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff2aeadcb95f33e73dd9a206038afa1ebeb24047;p=thirdparty%2Fbacula.git

baculum: Tweak improve web server files permissions
---

diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile
index 73d61a4bd..224d35a96 100644
--- a/gui/baculum/Makefile
+++ b/gui/baculum/Makefile
@@ -89,7 +89,7 @@ prepare_build:
 	$(DESTDIR)$(LOCALEDIR) \
 	$(DESTDIR)$(WWWDIR)/$(cachedir) \
 	$(DESTDIR)$(WWWDIR)/$(configcachedir)
-	mkdir -m 700 -p $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache \
+	mkdir -m 750 -p $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache \
 	$(DESTDIR)$(CONFDIR)/$(configdir)-api-lighttpd \
 	$(DESTDIR)$(CONFDIR)/$(configdir)-web-apache \
 	$(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd
@@ -128,12 +128,12 @@ prepare_locale: prepare_build
 	done
 
 prepare_samples:
-	install -m 640 $(samplesdir)/$(NAME)-api-lighttpd.conf $(DESTDIR)$(CONFDIR)
-	install -m 640 $(samplesdir)/$(NAME)-web-lighttpd.conf $(DESTDIR)$(CONFDIR)
+	install -m 644 $(samplesdir)/$(NAME)-api-lighttpd.conf $(DESTDIR)$(CONFDIR)
+	install -m 644 $(samplesdir)/$(NAME)-web-lighttpd.conf $(DESTDIR)$(CONFDIR)
 	install -m 644 $(samplesdir)/$(NAME)-api-lighttpd.service $(DESTDIR)$(UNITDIR)
 	install -m 644 $(samplesdir)/$(NAME)-web-lighttpd.service $(DESTDIR)$(UNITDIR)
-	install -m 640 $(samplesdir)/$(NAME)-api-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-api.conf
-	install -m 640 $(samplesdir)/$(NAME)-web-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-web.conf
+	install -m 644 $(samplesdir)/$(NAME)-api-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-api.conf
+	install -m 644 $(samplesdir)/$(NAME)-web-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-web.conf
 	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-api-lighttpd
 	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache
 	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd
diff --git a/gui/baculum/examples/baculum-install-checker.sh b/gui/baculum/examples/baculum-install-checker.sh
index 5f3faa38d..f0914adea 100755
--- a/gui/baculum/examples/baculum-install-checker.sh
+++ b/gui/baculum/examples/baculum-install-checker.sh
@@ -184,7 +184,7 @@ check_apache_cfgs ()
 	fi
 
 	local own_req="root:root"
-	local perm_req="640"
+	local perm_req="644"
 	local file="${HTTPDCONFDIR}/${NAME}-api.conf"
 	local file_desc="Baculum API Apache config file"
 	if [ ! -e "$file" ]
@@ -246,8 +246,8 @@ check_apache_cfgs ()
 
 check_lighttpd_cfgs ()
 {
-	local own_req="`get_lighttpd_user_group`"
-	local perm_req="640"
+	local own_req="root:root"
+	local perm_req="644"
 	local file="${CONFDIR}/${NAME}-api-lighttpd.conf"
 	local file_desc="Baculum API Lighttpd config file"
 	if [ ! -e "$file" ]
diff --git a/gui/baculum/examples/rpm-template/baculum.spec b/gui/baculum/examples/rpm-template/baculum.spec
index 5fa12699c..a6288fa25 100644
--- a/gui/baculum/examples/rpm-template/baculum.spec
+++ b/gui/baculum/examples/rpm-template/baculum.spec
@@ -430,7 +430,7 @@ done
 # Apache logs are stored in /var/log/httpd/
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{metaname}-api.conf
 %attr(755,apache,apache) %{_localstatedir}/cache/%{metaname}/
-%attr(700,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/
+%attr(750,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/
 %config(noreplace) %attr(600,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/%{metaname}.users
 %attr(755,apache,apache) %{_datadir}/%{metaname}/htdocs/protected/API/Logs
 
@@ -442,7 +442,7 @@ done
 # Apache logs are stored in /var/log/httpd/
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{metaname}-web.conf
 %attr(755,apache,apache) %{_localstatedir}/cache/%{metaname}/
-%attr(700,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/
+%attr(750,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/
 %config(noreplace) %attr(600,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/%{metaname}.users
 %attr(755,apache,apache) %{_datadir}/%{metaname}/htdocs/protected/Web/Logs
 
@@ -450,7 +450,7 @@ done
 %defattr(644,root,root)
 # Lighttpd logs are stored in /var/log/lighttpd
 %attr(755,lighttpd,lighttpd) %{_localstatedir}/cache/%{metaname}/
-%attr(700,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/
+%attr(750,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/
 %config(noreplace) %attr(600,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/%{metaname}.users
 %attr(755,lighttpd,lighttpd) %{_datadir}/%{metaname}/htdocs/protected/API/Logs
 %{_unitdir}/%{metaname}-api-lighttpd.service
@@ -460,7 +460,7 @@ done
 %defattr(644,root,root)
 # Lighttpd logs are stored in /var/log/lighttpd
 %attr(755,lighttpd,lighttpd) %{_localstatedir}/cache/%{metaname}/
-%attr(700,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/
+%attr(750,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/
 %config(noreplace) %attr(600,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/%{metaname}.users
 %attr(755,lighttpd,lighttpd) %{_datadir}/%{metaname}/htdocs/protected/Web/Logs
 %{_unitdir}/%{metaname}-web-lighttpd.service
diff --git a/gui/baculum/examples/rpm/baculum.spec b/gui/baculum/examples/rpm/baculum.spec
index 5fa12699c..a6288fa25 100644
--- a/gui/baculum/examples/rpm/baculum.spec
+++ b/gui/baculum/examples/rpm/baculum.spec
@@ -430,7 +430,7 @@ done
 # Apache logs are stored in /var/log/httpd/
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{metaname}-api.conf
 %attr(755,apache,apache) %{_localstatedir}/cache/%{metaname}/
-%attr(700,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/
+%attr(750,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/
 %config(noreplace) %attr(600,apache,apache) %{_sysconfdir}/%{metaname}/Config-api-apache/%{metaname}.users
 %attr(755,apache,apache) %{_datadir}/%{metaname}/htdocs/protected/API/Logs
 
@@ -442,7 +442,7 @@ done
 # Apache logs are stored in /var/log/httpd/
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{metaname}-web.conf
 %attr(755,apache,apache) %{_localstatedir}/cache/%{metaname}/
-%attr(700,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/
+%attr(750,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/
 %config(noreplace) %attr(600,apache,apache) %{_sysconfdir}/%{metaname}/Config-web-apache/%{metaname}.users
 %attr(755,apache,apache) %{_datadir}/%{metaname}/htdocs/protected/Web/Logs
 
@@ -450,7 +450,7 @@ done
 %defattr(644,root,root)
 # Lighttpd logs are stored in /var/log/lighttpd
 %attr(755,lighttpd,lighttpd) %{_localstatedir}/cache/%{metaname}/
-%attr(700,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/
+%attr(750,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/
 %config(noreplace) %attr(600,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-api-lighttpd/%{metaname}.users
 %attr(755,lighttpd,lighttpd) %{_datadir}/%{metaname}/htdocs/protected/API/Logs
 %{_unitdir}/%{metaname}-api-lighttpd.service
@@ -460,7 +460,7 @@ done
 %defattr(644,root,root)
 # Lighttpd logs are stored in /var/log/lighttpd
 %attr(755,lighttpd,lighttpd) %{_localstatedir}/cache/%{metaname}/
-%attr(700,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/
+%attr(750,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/
 %config(noreplace) %attr(600,lighttpd,lighttpd) %{_sysconfdir}/%{metaname}/Config-web-lighttpd/%{metaname}.users
 %attr(755,lighttpd,lighttpd) %{_datadir}/%{metaname}/htdocs/protected/Web/Logs
 %{_unitdir}/%{metaname}-web-lighttpd.service