baculum: Tweak change cache directory permissions

diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile
index 584279cfc5ca39d4a7007d147cf277600bf05886..b658937fc14e5949a4f4e19c0573b0371ec38907 100644 (file)
--- a/gui/baculum/Makefile
+++ b/gui/baculum/Makefile
@@ -19,6 +19,7 @@ UNITDIR = $(SYSUSRDIR)/lib/systemd/system
 LOCALEDIR = $(SYSUSRDIR)/share/locale
 WWWDIR ?= $(SYSUSRDIR)/share/$(NAME)/htdocs
 CACHEDIR = $(SYSVARDIR)/cache/$(NAME)
+VARLIBDIR = $(SYSVARDIR)/lib/$(NAME)
 LOGDIR = $(SYSVARDIR)/log
 HTTPDLOGS = $(LOGDIR)/$(HTTPDNAME)
 LIGHTTPDLOGS = $(LOGDIR)/lighttpd
@@ -85,15 +86,16 @@ prepare_build:
        $(DESTDIR)$(CONFDIR) \
        $(DESTDIR)$(HTTPDCONFDIR) \
        $(DESTDIR)$(UNITDIR) \
-       $(DESTDIR)$(WWWDIR) \
-       $(DESTDIR)$(CACHEDIR) \
        $(DESTDIR)$(LOCALEDIR) \
-       $(DESTDIR)$(WWWDIR)/$(cachedir) \
-       $(DESTDIR)$(WWWDIR)/$(configcachedir)
+       $(DESTDIR)$(WWWDIR) \
+       $(DESTDIR)$(WWWDIR)/$(cachedir)
        mkdir -m 750 -p $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache \
        $(DESTDIR)$(CONFDIR)/$(configdir)-api-lighttpd \
        $(DESTDIR)$(CONFDIR)/$(configdir)-web-apache \
-       $(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd
+       $(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd \
+       $(DESTDIR)$(WWWDIR)/$(configcachedir) \
+       $(DESTDIR)$(CACHEDIR) \
+       $(DESTDIR)$(VARLIBDIR)
 
 prepare_data: prepare_build
        mkdir -p $(DESTDIR)$(WWWDIR)/$(datadir) \
@@ -149,7 +151,6 @@ prepare_check_script:
        sed -i -e "s#%CONFDIR#$(CONFDIR)#g" $(DESTDIR)/$(NAME)-install-checker.sh
        sed -i -e "s#%HTTPDCONFDIR#$(HTTPDCONFDIR)#g" $(DESTDIR)/$(NAME)-install-checker.sh
        sed -i -e "s#%WWWDIR#$(WWWDIR)#g" $(DESTDIR)/$(NAME)-install-checker.sh
-       sed -i -e "s#%CACHEDIR#$(CACHEDIR)#g" $(DESTDIR)/$(NAME)-install-checker.sh
        sed -i -e "s#%HTTPDLOGS#$(HTTPDLOGS)#g" $(DESTDIR)/$(NAME)-install-checker.sh
        sed -i -e "s#%LIGHTTPDLOGS#$(LIGHTTPDLOGS)#g" $(DESTDIR)/$(NAME)-install-checker.sh
 

diff --git a/gui/baculum/examples/baculum-install-checker.sh b/gui/baculum/examples/baculum-install-checker.sh
index f0914adea243bd8bdc4e96badab6d101837b5106..5ff6ad22433945b8c4e3463125bf6127dc3055ee 100755 (executable)
--- a/gui/baculum/examples/baculum-install-checker.sh
+++ b/gui/baculum/examples/baculum-install-checker.sh
@@ -41,7 +41,6 @@ SAMPLETYPE=%SAMPLETYPE
 CONFDIR=%CONFDIR
 HTTPDCONFDIR=%HTTPDCONFDIR
 WWWDIR=%WWWDIR
-CACHEDIR=%CACHEDIR
 HTTPDLOGS=%HTTPDLOGS
 LIGHTTPDLOGS=%LIGHTTPDLOGS
 
@@ -420,7 +419,7 @@ check_baculum_files ()
 {
        local -r own_req="$1"
 
-       perm_req="755"
+       perm_req="750"
        dir="${WWWDIR}/${cachedir}"
        dir_desc="Baculum cache directory"
        if [ -h "$dir" ]
@@ -453,7 +452,7 @@ check_baculum_files ()
        dir_desc="Baculum API log directory"
        if [ ! -d "$dir" ]
        then
-               log 1 "$dir_desc does not exist: ${CACHEDIR}"
+               log 1 "$dir_desc does not exist: $dir"
        else
                check_ownership "$dir" "$own_req" "$dir_desc"
                check_perms "$dir" "$perm_req" "$dir_desc"
@@ -463,7 +462,7 @@ check_baculum_files ()
        dir_desc="Baculum Web log directory"
        if [ ! -d "$dir" ]
        then
-               log 1 "$dir_desc does not exist: ${CACHEDIR}"
+               log 1 "$dir_desc does not exist: $dir"
        else
                check_ownership "$dir" "$own_req" "$dir_desc"
                check_perms "$dir" "$perm_req" "$dir_desc"