Date: Thu, 8 Oct 2015 14:07:20 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398826 - in head/net-mgmt/icingaweb2: . files Message-ID: <201510081407.t98E7KmP071193@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Thu Oct 8 14:07:20 2015 New Revision: 398826 URL: https://svnweb.freebsd.org/changeset/ports/398826 Log: - Move SQL setup scripts from DATADIR to WWWDIR/etc, so the web setup wizard can find it - Mention the SQL setup scripts in pkg-message for use in a manual configuration - Bump PORTREVISION Modified: head/net-mgmt/icingaweb2/Makefile head/net-mgmt/icingaweb2/files/pkg-message.in head/net-mgmt/icingaweb2/pkg-plist Modified: head/net-mgmt/icingaweb2/Makefile ============================================================================== --- head/net-mgmt/icingaweb2/Makefile Thu Oct 8 13:47:43 2015 (r398825) +++ head/net-mgmt/icingaweb2/Makefile Thu Oct 8 14:07:20 2015 (r398826) @@ -3,6 +3,7 @@ PORTNAME= icingaweb2 DISTVERSIONPREFIX= v DISTVERSION= 2.0.0 +PORTREVISION= 1 CATEGORIES= net-mgmt www MAINTAINER= lme@FreeBSD.org @@ -41,11 +42,8 @@ do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d/ ${INSTALL_DATA} ${WRKSRC}/etc/bash_completion.d/icingacli \ ${STAGEDIR}${EXAMPLESDIR}/bash_completion.d - ${MKDIR} ${STAGEDIR}${DATADIR} - (cd ${WRKSRC}/etc && \ - ${COPYTREE_SHARE} schema ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${RM} -r .mailmap changelog.py icingaweb2.spec \ - bin/license_writer.py etc packages test) + bin/license_writer.py packages test) ${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) Modified: head/net-mgmt/icingaweb2/files/pkg-message.in ============================================================================== --- head/net-mgmt/icingaweb2/files/pkg-message.in Thu Oct 8 13:47:43 2015 (r398825) +++ head/net-mgmt/icingaweb2/files/pkg-message.in Thu Oct 8 14:07:20 2015 (r398826) @@ -8,3 +8,6 @@ cd %%WWWDIR%% && ./bin/icingacli setup t Enter this token on Icinga Web 2's setup interface at http://localhost/icingaweb2/setup + +If you like to create the database schemas manually, you can find the +SQL files at %%WWWDIR%%/etc/schema Modified: head/net-mgmt/icingaweb2/pkg-plist ============================================================================== --- head/net-mgmt/icingaweb2/pkg-plist Thu Oct 8 13:47:43 2015 (r398825) +++ head/net-mgmt/icingaweb2/pkg-plist Thu Oct 8 14:07:20 2015 (r398826) @@ -1,10 +1,10 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/apache/icingaweb2.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bash_completion.d/icingacli %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx/icingaweb2.conf -%%DATADIR%%/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql -%%DATADIR%%/schema/mysql.schema.sql -%%DATADIR%%/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql -%%DATADIR%%/schema/pgsql.schema.sql +%%ETCDIR%%/schema/mysql-upgrades/2.0.0beta3-2.0.0rc1.sql +%%ETCDIR%%/schema/mysql.schema.sql +%%ETCDIR%%/schema/pgsql-upgrades/2.0.0beta3-2.0.0rc1.sql +%%ETCDIR%%/schema/pgsql.schema.sql %%WWWDIR%%/AUTHORS %%WWWDIR%%/COPYING %%WWWDIR%%/ChangeLog
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510081407.t98E7KmP071193>