1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- unbreak stage phase where the squid user is unknown

Noted by John Marino by PM
This commit is contained in:
Olli Hauer 2014-07-23 23:27:39 +00:00
parent ebe19cd72b
commit cbb42e3e70
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362754
3 changed files with 10 additions and 5 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= squidstats
PORTVERSION= 54
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= squidstats-r${PORTVERSION}
@ -20,6 +20,7 @@ SHEBANG_FILES= graph/src/stats.pl.in
USERS= squid
GROUPS= squid
PLIST_SUB+= WWWOWN=${WWWOWN} SQUID_USER=${USERS}
SUB_FILES= pkg-message

View File

@ -1,5 +1,5 @@
--- ./graph/src/Makefile.orig 2014-07-19 13:30:29.000000000 +0200
+++ ./graph/src/Makefile 2014-07-19 13:32:27.000000000 +0200
--- ./graph/src/Makefile.orig 2009-01-07 19:20:02.000000000 +0100
+++ ./graph/src/Makefile 2014-07-24 01:02:02.000000000 +0200
@@ -33,21 +33,21 @@
$(RM) stats.pl config.ini graph-summary.cgi
@ -25,8 +25,8 @@
- $(INSTALL) -m 0644 templates.conf $(ETCDIR)/templates.conf
- $(INSTALL) -m 0644 snmp_monitor.cfg $(ETCDIR)/snmp_monitor.cfg
- $(INSTALL) -m 0644 graph.css $(WEB_DATADIR)/graph.css
+ $(INSTALL_DIR) -m 0755 -o $(WEB_USER) $(DESTDIR)$(GRAPH_DATADIR)
+ $(INSTALL_DIR) -m 0755 -o $(STATS_USER) $(DESTDIR)$(RRD_DATADIR)
+ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(GRAPH_DATADIR)
+ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(RRD_DATADIR)
+ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(WEB_DATADIR)
+ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(CGIDIR)
+ $(INSTALL_DIR) -m 0755 $(DESTDIR)$(ETCDIR)

View File

@ -24,6 +24,10 @@ www/cgi-bin/graph-summary.cgi
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%
@dirrmtry www/cgi-bin
@cwd /
@comment set directory owner
@exec chown -R %%WWWOWN%% "/var/db/squidstats/graphs"
@exec chown -R %%SQUID_USER%% "/var/db/squidstats/rrd"
@unexec rmdir "/var/db/squidstats/graphs" >/dev/null 2>&1 || :
@unexec rmdir "/var/db/squidstats/rrd" >/dev/null 2>&1 || :
@unexec rmdir "/var/db/squidstats" >/dev/null 2>&1 || :