Attachment #198382 for bug #232460

Lines 2-7 Link Here

(-)net-mgmt/ocsinventory-ocsreports/Makefile (-1 / +4 lines)
2		2
3	PORTNAME= ocsinventory-ocsreports	3	PORTNAME= ocsinventory-ocsreports
4	PORTVERSION= 2.5	4	PORTVERSION= 2.5
		5	PORTREVISION= 1
5	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
6		7
7	MAINTAINER= dgeo@centrale-marseille.fr	8	MAINTAINER= dgeo@centrale-marseille.fr
Lines 19-25 Link Here
19	GH_PROJECT= OCSInventory-ocsreports	20	GH_PROJECT= OCSInventory-ocsreports
20	SUB_FILES= apache.conf pkg-message	21	SUB_FILES= apache.conf pkg-message
21		22
22	ETCDIR= ${PREFIX}/etc/OCSInventory	23	ETCDIR= ${PREFIX}/etc/ocsinventory-server
23		24
24	do-install:	25	do-install:
25	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}	26	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
Lines 27-31 Link Here
27	${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample	28	${INSTALL_DATA} ${WRKSRC}/dbconfig.inc.php ${STAGEDIR}${WWWDIR}/dbconfig.inc.php.sample
28	${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php ${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample	29	${INSTALL_DATA} ${WRKSRC}/backend/require/cas.config.php ${STAGEDIR}${WWWDIR}/backend/require/cas.config.php.sample
29	${INSTALL_DATA} ${WRKDIR}/apache.conf ${STAGEDIR}${ETCDIR}/ocsreports.inc.sample	30	${INSTALL_DATA} ${WRKDIR}/apache.conf ${STAGEDIR}${ETCDIR}/ocsreports.inc.sample
		31	${MKDIR} ${STAGEDIR}${DATADIR}/packages
		32	${MKDIR} ${STAGEDIR}${DATADIR}/snmp
30		33
31	.include <bsd.port.mk>	34	.include <bsd.port.mk>




# 
# Alias to put Deployment package files outside Apache document root directory
#
<Directory %%DATADIR%%/packages>
   <IfModule mod_authz_core.c>
     # Apache 2.4
     Require all granted

     Allow from all
   </IfModule>
</Directory>
Alias /ocs/packages %%DATADIR%%/packages


################################################################################

#
# Alias to put Snmp custom Mibs files outside Apache document root directory
#
<Directory %%DATADIR%%/snmp>
   <IfModule mod_authz_core.c>
     # Apache 2.4
     Require all granted

     Allow from all
   </IfModule>
</Directory>
Alias /ocs/snmp %%DATADIR%%/snmp


Lines 732-734 Link Here

(-)net-mgmt/ocsinventory-ocsreports/pkg-plist (+2 lines)
732	%%WWWDIR%%/update.php	732	%%WWWDIR%%/update.php
733	%%WWWDIR%%/upload/README	733	%%WWWDIR%%/upload/README
734	%%WWWDIR%%/var.php	734	%%WWWDIR%%/var.php
		735	@dir %%DATADIR%%/packages
		736	@dir %%DATADIR%%/snmp

Return to bug 232460

Lines 64-70 Link Here

(-)net-mgmt/ocsinventory-ocsreports/files/apache.conf.in (-4 / +4 lines)
64	#	64	#
65	# Alias to put Deployment package files outside Apache document root directory	65	# Alias to put Deployment package files outside Apache document root directory
66	#	66	#
67	<Directory %%SHAREDIR%%/packages>	67	<Directory %%DATADIR%%/packages>
68	<IfModule mod_authz_core.c>	68	<IfModule mod_authz_core.c>
69	# Apache 2.4	69	# Apache 2.4
70	Require all granted	70	Require all granted
Lines 74-80 Link Here
74	Allow from all	74	Allow from all
75	</IfModule>	75	</IfModule>
76	</Directory>	76	</Directory>
77	Alias /ocs/packages %%SHAREDIR%%/packages	77	Alias /ocs/packages %%DATADIR%%/packages
78		78
79		79
80	################################################################################	80	################################################################################
Lines 82-88 Link Here
82	#	82	#
83	# Alias to put Snmp custom Mibs files outside Apache document root directory	83	# Alias to put Snmp custom Mibs files outside Apache document root directory
84	#	84	#
85	<Directory %%SHAREDIR%%/snmp>	85	<Directory %%DATADIR%%/snmp>
86	<IfModule mod_authz_core.c>	86	<IfModule mod_authz_core.c>
87	# Apache 2.4	87	# Apache 2.4
88	Require all granted	88	Require all granted
Lines 92-96 Link Here
92	Allow from all	92	Allow from all
93	</IfModule>	93	</IfModule>
94	</Directory>	94	</Directory>
95	Alias /ocs/snmp %%SHAREDIR%%/snmp	95	Alias /ocs/snmp %%DATADIR%%/snmp
96		96