From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 62685138247 for ; Wed, 25 Dec 2013 21:24:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14788E087F; Wed, 25 Dec 2013 21:24:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98E67E087F for ; Wed, 25 Dec 2013 21:24:53 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15B7B33F6C1 for ; Wed, 25 Dec 2013 21:24:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 61FECE54C1 for ; Wed, 25 Dec 2013 21:24:50 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1388006786.7c77f35dc83592e650d3aaf32829aeb1e565a1b8.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/, www-misc/zoneminder/ X-VCS-Repository: dev/dilfridge X-VCS-Files: www-misc/zoneminder/files/10_zoneminder.conf www-misc/zoneminder/files/init.d www-misc/zoneminder/zoneminder-1.26.5.ebuild X-VCS-Directories: www-misc/zoneminder/files/ www-misc/zoneminder/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 7c77f35dc83592e650d3aaf32829aeb1e565a1b8 X-VCS-Branch: master Date: Wed, 25 Dec 2013 21:24:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa9c0237-896c-46e0-b064-4d26983f72b2 X-Archives-Hash: a931a20e2744e5bb92dceba93b8246ce commit: 7c77f35dc83592e650d3aaf32829aeb1e565a1b8 Author: Andreas K. Huettel (dilfridge) gentoo org> AuthorDate: Wed Dec 25 21:26:26 2013 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Wed Dec 25 21:26:26 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=7c77f35d [www-misc/zoneminder] fix path in apache conf, deps in init script, install instructions, permissions of zm.conf Package-Manager: portage-2.2.7 --- www-misc/zoneminder/files/10_zoneminder.conf | 10 +++++----- www-misc/zoneminder/files/init.d | 3 ++- www-misc/zoneminder/zoneminder-1.26.5.ebuild | 10 +++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf index 0ddb675..1190fad 100644 --- a/www-misc/zoneminder/files/10_zoneminder.conf +++ b/www-misc/zoneminder/files/10_zoneminder.conf @@ -1,16 +1,16 @@ -ScriptAlias /cgi-bin/zms "/var/www/zoneminder/cgi-bin/zms" -ScriptAlias /cgi-bin/nph-zms "/var/www/zoneminder/cgi-bin/nph-zms" +ScriptAlias /cgi-bin/zms "/var/www/zm/cgi-bin/zms" +ScriptAlias /cgi-bin/nph-zms "/var/www/zm/cgi-bin/nph-zms" - + AllowOverride All Options ExecCGI Order allow,deny Allow from all -Alias /zoneminder "/var/www/zoneminder/htdocs" +Alias /zoneminder "/var/www/zm/htdocs" - + Options -Indexes MultiViews FollowSymLinks AllowOverride All Order allow,deny diff --git a/www-misc/zoneminder/files/init.d b/www-misc/zoneminder/files/init.d index 00c5045..30a9b13 100644 --- a/www-misc/zoneminder/files/init.d +++ b/www-misc/zoneminder/files/init.d @@ -4,7 +4,8 @@ # $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/files/Attic/init.d,v 1.3 2009/01/01 16:47:24 gentoofan23 Exp $ depend() { - use mysql + need mysql + need apache2 } start_pre() { diff --git a/www-misc/zoneminder/zoneminder-1.26.5.ebuild b/www-misc/zoneminder/zoneminder-1.26.5.ebuild index 0f507d9..aae3093 100644 --- a/www-misc/zoneminder/zoneminder-1.26.5.ebuild +++ b/www-misc/zoneminder/zoneminder-1.26.5.ebuild @@ -101,6 +101,7 @@ src_install() { cmake-utils_src_install fperms 0640 /etc/zm.conf + fowners root:apache /etc/zm.conf fowners apache:apache /var/log/zm @@ -119,10 +120,13 @@ src_install() { DOC_CONTENTS=" 1. If this is a new installation, you will need to create a MySQL\n database for ${PN} to use\n - (see http://www.gentoo.org/doc/en/mysql-howto.xml).\n + (see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).\n + E.g., when logged into mysql as root,\n + mysql> CREATE DATABASE 'zm';\n + mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';\n Once you completed that you should execute the following:\n - cd /usr/share/${PN}\n - mysql -u -p < db/zm_create.sql\n + cd /usr/share/${PN}\n + mysql -u zmuser -p < db/zm_create.sql\n \n 2. Set your database settings in /etc/zm.conf\n \n