diff options
| -rw-r--r-- | .SRCINFO | 102 | ||||
| -rw-r--r-- | PKGBUILD | 251 | ||||
| -rw-r--r-- | fcgiwrap-multiwatch.service | 13 | ||||
| -rw-r--r-- | zoneminder-httpd.conf | 53 | ||||
| -rw-r--r-- | zoneminder-nginx.conf | 43 | ||||
| -rw-r--r-- | zoneminder-php.ini | 10 | ||||
| -rw-r--r-- | zoneminder-tmpfile.conf | 3 | ||||
| -rw-r--r-- | zoneminder.install | 67 | ||||
| -rw-r--r-- | zoneminder.service | 7 |
9 files changed, 364 insertions, 185 deletions
@@ -1,58 +1,76 @@ -# Generated by mksrcinfo v8 -# Sun Jan 10 21:56:05 UTC 2016 pkgbase = zoneminder-git - pkgdesc = Capture, analyse, record and monitor video security cameras - pkgver = 1.29.0 - pkgrel = 3 - url = https://github.com/ZoneMinder/ZoneMinder/releases + pkgdesc = A complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras + pkgver = 1.33.16.r14355.fd633a217 + pkgrel = 2 + url = https://github.com/ZoneMinder/ZoneMinder install = zoneminder.install - arch = i686 arch = x86_64 - arch = mips64el - arch = arm - arch = armv7h - license = GPL + license = GPL2 makedepends = cmake - makedepends = make - makedepends = gcc - makedepends = netpbm - depends = mariadb - depends = perl-dbd-mysql - depends = perl-dbi - depends = apache - depends = php - depends = php-apache - depends = php-gd - depends = php-mcrypt - depends = perl-php-serialization - depends = perl-libwww - depends = perl-net-sftp-foreign - depends = ffmpeg - depends = vlc - depends = perl-sys-mmap - depends = gnutls depends = polkit - depends = perl-expect + depends = ffmpeg + depends = libmp4v2 + depends = php-apcu + depends = php-fpm + depends = php-gd depends = perl-archive-zip + depends = perl-data-dump depends = perl-date-manip + depends = perl-dbd-mysql + depends = perl-device-serialport + depends = perl-file-slurp + depends = perl-image-info + depends = perl-libwww depends = perl-mime-lite depends = perl-mime-tools - optdepends = netpbm - optdepends = cambozola - optdepends = perl-time-modules - optdepends = perl-x10 - optdepends = perl-astro-suntime - backup = etc/zm.conf + depends = perl-number-bytes-human + depends = perl-sys-meminfo + depends = perl-sys-mmap + depends = perl-crypt-eksblowfish + depends = perl-data-entropy + depends = perl-class-load + depends = perl-data-uuid + depends = perl-io-socket-multicast + depends = perl-soap-wsdl + depends = perl-xml-parser + depends = perl-datetime + depends = perl-lwp-protocol-https + depends = perl-json-maybexs + depends = perl-net-sftp-foreign + depends = perl-php-serialization + depends = perl-sys-cpu + depends = perl-uri-encode + depends = nginx-mainline + depends = fcgiwrap + depends = spawn-fcgi + depends = multiwatch + depends = mariadb + optdepends = apache: alternative web server + optdepends = vlc: provides libvlc (may achieve better performance with some camera models) + optdepends = zmeventnotification-git: suppport for push notifications and machine learning recognition + provides = zoneminder + conflicts = zoneminder + backup = etc/nginx/sites-available/zoneminder.conf + backup = etc/httpd/conf/extra/zoneminder.conf + backup = etc/php/conf.d/zoneminder.ini source = git://github.com/zoneminder/zoneminder.git - source = git://github.com/FriendsOfCake/crud.git - source = httpd-zoneminder.conf + source = https://github.com/FriendsOfCake/crud/archive/v3.2.0.tar.gz + source = https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/1.0-zm.tar.gz + source = zoneminder-nginx.conf + source = zoneminder-httpd.conf + source = zoneminder-php.ini source = zoneminder.service source = zoneminder-tmpfile.conf + source = fcgiwrap-multiwatch.service sha256sums = SKIP - sha256sums = SKIP - sha256sums = ff7382b38ac07dadead0ad4d583e3dbcf8da4aaa06b76d048ee334f69f95db67 - sha256sums = 043d77a995553c533d62f48db4b719d29cf6c7074f215d866130e97be57ed646 - sha256sums = cc8af737c3c07750fc71317c81999376e4bbb39da883780164a8747b3d7c95a7 + sha256sums = 55be29e1eccb44d4ad0db8b23c37cec50f5341f8e498583d472ed1f0493876e3 + sha256sums = dbd231e97b950c698f0f501d6a53c7291c9985e766b09e3afe00cfe69a969f44 + sha256sums = f176e0262e3ad0a93b73760ba01eee47f97b3e51c58ebbd82c0dc31eadafc274 + sha256sums = 091b9167cb381b8a81c57dfd19f68e35b7319ed1f7a41814daa2a26d97776c6b + sha256sums = c02653c52acb790a95d4d28166a087077eb25ae2921590c890247c0396f13b62 + sha256sums = 3e4de227e3154dffa887f2286c339ab3cf456f6d74a400b2786192b7e2b129c0 + sha256sums = b69ac1deaaf3cf84b4ae4dbab794e1b062823de817f1e3a816ccf5438db440c0 + sha256sums = e95f9bef77aef647dd633bd9ad75dc099b6d7184684e133f2f20702de83a6260 pkgname = zoneminder-git @@ -1,148 +1,181 @@ -# Maintainer: Troy Will <troydwill at gmail dot com> +# Maintainer: Luis Aranguren <pizzaman@hotmail.com> +# Contributor: Mesmer <mesmer@fisica.if.uff.br> +# Contributor: Troy Will <troydwill at gmail dot com> # Contributor: /dev/rs0 </dev/rs0@secretco.de.com> # Contributor: Jacek Burghardt <jacek@hebe.us> # Contributor: Vojtech Aschenbrenner <v@asch.cz> # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> -# Contributor (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor: (Parabola): Márcio Silva <coadde@lavabit.com> +# Contributor: (Parabola): André Silva <emulatorman@lavabit.com> # Contributor: Charles Spence IV <cspence@unomaha.edu> -# Contributor: Joe Julian <me@joejulian.name> +# Contributor: Joe Julian <me@joejulian.name> # Orginally based on a Debian Squeeze package -_pkgname=zoneminder +# Update to 1.33.15 - based on https://aur.archlinux.org/packages/zoneminder/ by Alexandros Michalopoulos (Nocifer) + +### Important notes for version 1.32.x ### +# +# 1) git-clone for CakePHP and Crud sources was replaced with published precompiled packages, as follows: +# - CakePHP-Enum-Behaviour is pulled from the ZoneMinder repo, because a change is needed that has not yet been merged upstream. +# - Crud is pulled from its official repo, since Pull Request #582 has been merged as required by the ZoneMinder devs. +# +# 2) By default, ZoneMinder now runs at localhost:8095 instead of localhost/zm (this can be changed by editing the provided conf files). +# +# 3) Apache was switched out in favor of Nginx, but remains as an optional dependency. + +####################################################################################################################### +# # +# If you're upgrading from a release older than 1.32.0: # +# # +# Due to the many breaking changes in new releases (both upstream and in the packaging), it's recommended to backup # +# any existing ZoneMinder databases and perform a clean installation. Failure to do so may have very weird results. # +# # +####################################################################################################################### + pkgname=zoneminder-git -pkgver=1.29.0 -pkgrel=3 -pkgdesc='Capture, analyse, record and monitor video security cameras' -arch=( i686 x86_64 mips64el arm armv7h ) -backup=( etc/zm.conf ) -url="https://github.com/ZoneMinder/ZoneMinder/releases" -license=( GPL ) -depends=( - mariadb perl-dbd-mysql perl-dbi - apache php php-apache php-gd php-mcrypt perl-php-serialization - perl-libwww perl-net-sftp-foreign - ffmpeg vlc perl-sys-mmap - gnutls polkit - perl-expect perl-archive-zip perl-date-manip - perl-mime-lite perl-mime-tools -) -makedepends=( - cmake make gcc netpbm -) -optdepends=( - netpbm - cambozola - perl-time-modules - perl-x10 - perl-astro-suntime +_pkgname=zoneminder +pkgver=1.33.16.r14355.fd633a217 +pkgrel=2 +pkgdesc='A complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras' +arch=('x86_64') +url='https://github.com/ZoneMinder/ZoneMinder' +license=('GPL2') +depends=('polkit' 'ffmpeg' 'libmp4v2' + 'php-apcu' 'php-fpm' 'php-gd' + 'perl-archive-zip' 'perl-data-dump' 'perl-date-manip' 'perl-dbd-mysql' 'perl-device-serialport' 'perl-file-slurp' 'perl-image-info' + 'perl-libwww' 'perl-mime-lite' 'perl-mime-tools' 'perl-number-bytes-human' 'perl-sys-meminfo' 'perl-sys-mmap' + #Needed for upgrade with zmupdate.pl + 'perl-crypt-eksblowfish' 'perl-data-entropy' + # Needed for ONVIF support + 'perl-class-load' 'perl-data-uuid' 'perl-io-socket-multicast' 'perl-soap-wsdl' 'perl-xml-parser' 'perl-datetime' + # Needed for SSL support + 'perl-lwp-protocol-https' + # Apparently needed for Telemetry support + 'perl-json-maybexs' + # Unverified dependencies. So far not installing them hasn't raised any red flags, but I can't be 100% sure whether they're leftovers from + # previous ZoneMinder incarnations or if they're needed for proper operation during runtime, so for the time being I'm leaving them in. + 'perl-net-sftp-foreign' 'perl-php-serialization' 'perl-sys-cpu' 'perl-uri-encode' + # Remove the following line if you don't need Nginx + 'nginx-mainline' 'fcgiwrap' 'spawn-fcgi' 'multiwatch' + # Remove the following line if you don't need MariaDB + 'mariadb' ) + +makedepends=('cmake') +optdepends=('apache: alternative web server' + 'vlc: provides libvlc (may achieve better performance with some camera models)' + 'zmeventnotification-git: suppport for push notifications and machine learning recognition') +provides=($_pkgname) +conflicts=($_pkgname) +backup=("etc/nginx/sites-available/$_pkgname.conf" + "etc/httpd/conf/extra/$_pkgname.conf" + "etc/php/conf.d/$_pkgname.ini") install=$_pkgname.install - -source=( - git://github.com/$_pkgname/$_pkgname.git - git://github.com/FriendsOfCake/crud.git - httpd-zoneminder.conf - zoneminder.service - zoneminder-tmpfile.conf +source=("git://github.com/$_pkgname/$_pkgname.git" + "https://github.com/FriendsOfCake/crud/archive/v3.2.0.tar.gz" + "https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/1.0-zm.tar.gz" + "zoneminder-nginx.conf" + "zoneminder-httpd.conf" + "zoneminder-php.ini" + "zoneminder.service" + "zoneminder-tmpfile.conf" + "fcgiwrap-multiwatch.service" ) -# Because the source is not static, skip Git checksum: sha256sums=('SKIP' - 'SKIP' - 'ff7382b38ac07dadead0ad4d583e3dbcf8da4aaa06b76d048ee334f69f95db67' - '043d77a995553c533d62f48db4b719d29cf6c7074f215d866130e97be57ed646' - 'cc8af737c3c07750fc71317c81999376e4bbb39da883780164a8747b3d7c95a7' - ) - + '55be29e1eccb44d4ad0db8b23c37cec50f5341f8e498583d472ed1f0493876e3' + 'dbd231e97b950c698f0f501d6a53c7291c9985e766b09e3afe00cfe69a969f44' + 'f176e0262e3ad0a93b73760ba01eee47f97b3e51c58ebbd82c0dc31eadafc274' + '091b9167cb381b8a81c57dfd19f68e35b7319ed1f7a41814daa2a26d97776c6b' + 'c02653c52acb790a95d4d28166a087077eb25ae2921590c890247c0396f13b62' + '3e4de227e3154dffa887f2286c339ab3cf456f6d74a400b2786192b7e2b129c0' + 'b69ac1deaaf3cf84b4ae4dbab794e1b062823de817f1e3a816ccf5438db440c0' + 'e95f9bef77aef647dd633bd9ad75dc099b6d7184684e133f2f20702de83a6260') + pkgver() { cd "$_pkgname" - # See https://wiki.archlinux.org/index.php/VCS_package_guidelines#The_pkgver.28.29_function - git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' + printf $(<version) && printf ".r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare () { - cd $srcdir/$_pkgname - git submodule init - git config submodule.web/api/app/Plugin/Crud.url $srcdir/crud - git config submodule.web/api/app/Plugin/Crud.branch 3.0 - git submodule update + cd $_pkgname + + # Move extra PHP plugins into place + cp -R $srcdir/crud-3.2.0/* web/api/app/Plugin/Crud + cp -R $srcdir/CakePHP-Enum-Behavior-1.0-zm/* web/api/app/Plugin/CakePHP-Enum-Behavior + + # Fix the launcher + sed -i 's|localhost/zm|localhost:8095|g' misc/$_pkgname.desktop.in } build() { - cd $srcdir/$_pkgname - - # ZM_PERL_SUBPREFIX=/lib/perl5 flag added to force Perl modules - # to /usr/lib/perl5/ on non i686 architectures - + cd $_pkgname cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DZM_PERL_SUBPREFIX=/lib/perl5 \ - -DZM_WEBDIR=/srv/http/zoneminder \ - -DZM_CGIDIR=/srv/http/cgi-bin \ - -DZM_WEB_USER=http \ - -DZM_CONTENTDIR=/var/cache/zoneminder \ - -DZM_LOGDIR=/var/log/zoneminder \ - -DZM_RUNDIR=/run/zoneminder \ - -DZM_TMPDIR=/var/lib/zoneminder/temp \ - -DZM_SOCKDIR=/var/lib/zoneminder/sock . - - make V=0 + -DZM_CONFIG_DIR=/etc/$_pkgname \ + -DZM_CONFIG_SUBDIR=/etc/$_pkgname/conf.d \ + -DZM_RUNDIR=/run/$_pkgname \ + -DZM_SOCKDIR=/run/$_pkgname \ + -DZM_LOGDIR=/var/log/$_pkgname \ + -DZM_TMPDIR=/var/tmp/$_pkgname \ + -DZM_CONTENTDIR=/var/lib/$_pkgname \ + -DZM_CACHEDIR=/var/lib/$_pkgname/cache \ + -DZM_WEBDIR=/srv/$_pkgname/www \ + -DZM_CGIDIR=/srv/$_pkgname/cgi-bin \ + -DZM_WEB_USER=http . + make -j$(nproc) } package() { + cd $_pkgname - cd $srcdir/$_pkgname + make DESTDIR=$pkgdir install - DESTDIR=$pkgdir make install + # Set Polkit directory permissions in accordance with Arch policy + chmod 750 $pkgdir/usr/share/polkit-1/rules.d + chown root:polkitd $pkgdir/usr/share/polkit-1/rules.d - # Change Polkit directory permissions to Arch Linux policy - chmod -v 700 $pkgdir/usr/share/polkit-1/rules.d/ - chown -v polkitd $pkgdir/usr/share/polkit-1/rules.d/ + # Create ZM_LOGDIR + install -dm775 -o http -g http $pkgdir/var/log/$_pkgname - # BEGIN CREATE_ZONEMINDER_DIRECTORIES - mkdir -pv $pkgdir/var/{cache/zoneminder,log/zoneminder} - chown -Rv http.http $pkgdir/var/{cache/zoneminder,log/zoneminder} + # Create ZM_CONTENTDIR and its subfolders + install -dm775 -o http -g http $pkgdir/var/lib/$_pkgname/{cache,events,images} - # corresponds to -DZM_SOCKDIR=/var/lib/zoneminder/sock - mkdir -pv $pkgdir/var/lib/zoneminder/sock - chown -v http.http $pkgdir/var/lib/zoneminder/sock + # Link ZM_CGIDIR and ZM_CACHEDIR inside ZM_WEBDIR and set correct permissions + ln -sf /srv/$_pkgname/cgi-bin $pkgdir/srv/$_pkgname/www + ln -sf /var/lib/$_pkgname/cache $pkgdir/srv/$_pkgname/www + chown -Rh http:http $pkgdir/srv/$_pkgname + + # Link ZM_WEBDIR/api/app/tmp to ZM_TMPDIR + ln -sf /var/tmp/$_pkgname $pkgdir/srv/$_pkgname/www/api/app/tmp - # corresponds to -DZM_TMPDIR=/var/lib/zoneminder/temp - mkdir -pv $pkgdir/var/lib/zoneminder/temp - chown -v http.http $pkgdir/var/lib/zoneminder/temp + # Temporary fix for hardcoded /zm/ links (credit goes to @Kubax on AUR) + ln -sf /srv/$_pkgname/www $pkgdir/srv/$_pkgname/www/zm - chown -v http.http $pkgdir/etc/zm.conf - chmod 0700 $pkgdir/etc/zm.conf - # END CREATE_ZONEMINDER_DIRECTORIES + # Set correct permissions for ZM_CONFIG_DIR & ZM_CONFIG_SUBDIR + chmod -R 755 $pkgdir/etc/$_pkgname + chmod 644 $pkgdir/etc/$_pkgname/zm.conf + chmod 644 $pkgdir/etc/$_pkgname/conf.d/* - # Make content directories in /var/cache/zoneminder and to link them in /srv/http/zoneminder - for i in events images temp; do - mkdir $pkgdir/var/cache/$_pkgname/$i - chown -v http.http $pkgdir/var/cache/$_pkgname/$i - ln -s /var/cache/$_pkgname/$i $pkgdir/srv/http/$_pkgname/$i - chown -v --no-dereference http.http $pkgdir/srv/http/$_pkgname/$i - done + # Install Nginx conf file + install -Dm644 $srcdir/$_pkgname-nginx.conf $pkgdir/etc/nginx/sites-available/$_pkgname.conf - # Create a link to the Zoneminder cgi binaries - ln -sv /srv/http/cgi-bin $pkgdir/srv/http/$_pkgname + # Install Apache conf file + install -Dm644 $srcdir/$_pkgname-httpd.conf $pkgdir/etc/httpd/conf/extra/$_pkgname.conf - chown -h http.http $pkgdir/srv/http/{cgi-bin,$_pkgname,$_pkgname/cgi-bin} + # Install PHP-FPM ini file + install -Dm644 $srcdir/$_pkgname-php.ini $pkgdir/etc/php/conf.d/$_pkgname.ini - # Link Cambozola - # ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$_pkgname + # Install systemd service + install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service - # Install configuration files - mkdir -p $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/httpd-$_pkgname.conf $pkgdir/etc/httpd/conf/extra - - mkdir -p $pkgdir/usr/lib/systemd/system - install -D -m 644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system - - install -D -m 644 COPYING $pkgdir/usr/share/license/$_pkgname - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$_pkgname/db - - mkdir -p $pkgdir/usr/share/doc/$_pkgname - # install -D -m 644 $srcdir/README $pkgdir/usr/share/doc/$_pkgname + # Install systemd tmpfile + install -Dm644 $srcdir/$_pkgname-tmpfile.conf $pkgdir/usr/lib/tmpfiles.d/$_pkgname.conf + + # Install fcgiwrap-multiwatch service + install -Dm644 $srcdir/fcgiwrap-multiwatch.service $pkgdir/usr/lib/systemd/system/fcgiwrap-multiwatch.service - install -Dm644 ../zoneminder-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/zoneminder.conf + # Install logrotate conf file + install -Dm644 misc/logrotate.conf $pkgdir/etc/logrotate.d/$_pkgname + # Copy default database schemas + install -Dm644 db/zm*.sql $pkgdir/usr/share/$_pkgname/db } diff --git a/fcgiwrap-multiwatch.service b/fcgiwrap-multiwatch.service new file mode 100644 index 000000000000..504e4a465802 --- /dev/null +++ b/fcgiwrap-multiwatch.service @@ -0,0 +1,13 @@ +[Unit] +Description=Simple CGI server launched in multiple parallel instances via spawn-fcgi and multiwatch +After=nss-user-lookup.target +Conflicts=fcgiwrap.socket + +[Service] +ExecStartPre=/usr/bin/rm -f /run/fcgiwrap.sock +ExecStart=/usr/bin/spawn-fcgi -n -s /run/fcgiwrap.sock -u http -g http -M 660 -- /usr/bin/multiwatch -f 10 -- /usr/bin/fcgiwrap +ExecStop=/usr/bin/killall -w -s 2 /usr/bin/fcgiwrap +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/zoneminder-httpd.conf b/zoneminder-httpd.conf new file mode 100644 index 000000000000..89f402b3cb12 --- /dev/null +++ b/zoneminder-httpd.conf @@ -0,0 +1,53 @@ +Listen 8095 + +<VirtualHost *:8095> + DocumentRoot /srv/zoneminder/www + + # PHP handler + <FilesMatch \.php$> + SetHandler "proxy:unix:/run/php-fpm/php-fpm.sock|fcgi://localhost/" + </FilesMatch> + + ScriptAlias /cgi-bin /srv/zoneminder/cgi-bin + <Directory /srv/zoneminder/cgi-bin> + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + AllowOverride None + Require all granted + </Directory> + + Alias /cache /var/lib/zoneminder/cache + <Directory /var/lib/zoneminder/cache> + Options -Indexes +FollowSymLinks + AllowOverride None + Require all granted + </Directory> + + <Directory /srv/zoneminder/www> + Options -Indexes +FollowSymLinks + AllowOverride None + Require all granted + DirectoryIndex index.php + </Directory> + + <Directory /srv/zoneminder/www/api> + RewriteEngine On + RewriteRule ^$ app/webroot/ [L] + RewriteRule (.*) app/webroot/$1 [L] + RewriteBase /api + </Directory> + + <Directory /srv/zoneminder/www/api/app> + RewriteEngine On + RewriteRule ^$ webroot/ [L] + RewriteRule (.*) webroot/$1 [L] + RewriteBase /api + </Directory> + + <Directory /srv/zoneminder/www/api/app/webroot> + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.php [L] + RewriteBase /api + </Directory> +</VirtualHost> diff --git a/zoneminder-nginx.conf b/zoneminder-nginx.conf new file mode 100644 index 000000000000..380562850445 --- /dev/null +++ b/zoneminder-nginx.conf @@ -0,0 +1,43 @@ +server { + listen 8095; + + root /srv/zoneminder/www; + + index index.php; + + access_log /var/log/zoneminder/http_access.log; + error_log /var/log/zoneminder/http_error.log; + + location / { + try_files $uri $uri/ /index.php?$args =404; + + location ~ /api/(css|img|ico) { + rewrite ^/api(.+)$ /api/app/webroot/$1 break; + try_files $uri $uri/ =404; + } + + location /api { + rewrite ^/api(.+)$ /api/app/webroot/index.php?p=$1 last; + } + + location /cgi-bin { + include fastcgi_params; + + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param HTTP_PROXY ""; + + fastcgi_pass unix:/run/fcgiwrap.sock; + } + + location ~ \.php$ { + include fastcgi_params; + + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_param HTTP_PROXY ""; + + fastcgi_index index.php; + + fastcgi_pass unix:/run/php-fpm/php-fpm.sock; + } + } +} diff --git a/zoneminder-php.ini b/zoneminder-php.ini new file mode 100644 index 000000000000..e45df988277b --- /dev/null +++ b/zoneminder-php.ini @@ -0,0 +1,10 @@ +extension=apcu +extension=ftp +extension=gd +extension=gettext +extension=pdo_mysql +extension=sockets +extension=sysvsem +extension=zip + +date.timezone = PLACEHOLDER diff --git a/zoneminder-tmpfile.conf b/zoneminder-tmpfile.conf index 84362b52b26a..c2e27aa1e62c 100644 --- a/zoneminder-tmpfile.conf +++ b/zoneminder-tmpfile.conf @@ -1 +1,2 @@ -d /run/zoneminder 0755 http http - +D /run/zoneminder 0775 http http +D /var/tmp/zoneminder 0775 http http diff --git a/zoneminder.install b/zoneminder.install index d16779e3b25e..79169766a959 100644 --- a/zoneminder.install +++ b/zoneminder.install @@ -38,31 +38,32 @@ post_install() { Zoneminder database setup: -------------------------- + Initialize and start mariadb if you haven't done it already https://wiki.archlinux.org/index.php/MariaDB#Installation + "sudo mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql" + "systemctl start mariadb.service" Zoneminder operation requires a database named 'zm' which is defined in /usr/share/zoneminder/db/zm_create.sql Create the Zoneminder database (with a password): - "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" - "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" - "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" + "sudo mysqladmin --defaults-file=/etc/my.cnf -p -f reload" + "cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/my.cnf -p" + "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | sudo mysql --defaults-file=/etc/my.cnf -p mysql" (or without a password): - "mysqladmin --defaults-file=/etc/mysql/my.cnf -f reload" - "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf" - "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" + "sudo mysqladmin --defaults-file=/etc/my.cnf -f reload" + "cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/my.cnf" + "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | sudo mysql --defaults-file=/etc/my.cnf mysql" PHP configuration ----------------- - * Check and make sure these are uncommented in /etc/php/php.ini: - extension=ftp.so - extension=gd.so - extension=gettext.so - extension=mcrypt.so - extension=openssl.so - extension=pdo_mysql.so - extension=sockets.so - extension=zip.so - * Set your timezone in php.ini: + + * Set your timezone in PHP configuration file /etc/php/conf.d/zoneminder.ini: date.timezone = <your_country>/<your_city> + Nginx configuration + ------------------- + sudo mkdir /etc/nginx/sites-enabled + sudo ln -s /etc/nginx/sites-available/zoneminder.conf /etc/nginx/sites-enabled/zoneminder.conf + Add "include /etc/nginx/sites-enabled/zoneminder.conf;" to the http section in /etc/nginx/nginx.conf + Apache configuration -------------------- Edit /etc/httpd/conf/httpd.conf and add the line: @@ -71,6 +72,14 @@ post_install() { "Include /etc/httpd/conf/extra/php7_module.conf" "Include /etc/httpd/conf/extra/httpd-zoneminder.conf" + Starting + -------- + Enable & Start the following: + mariadb.service + nginx.service + php-fpm.service + fcgiwrap-multiwatch.service + zoneminder.service EOF } @@ -95,13 +104,13 @@ post_remove() { cat << EOF Note: ==> To clean Zoneminder mysql database, run as root (with password): -==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" -==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql" -==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f drop zm" +==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/my.cnf -p mysql" +==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/my.cnf -p mysql" +==> "mysqladmin --defaults-file=/etc/my.cnf -p -f drop zm" ==> (or without password): -==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" -==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" -==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -f drop zm" +==> "echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/my.cnf mysql" +==> "echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/my.cnf mysql" +==> "mysqladmin --defaults-file=/etc/my.cnf -f drop zm" ==> Disable http with php if it isn't needed with others servers, ==> comment or remove that lines in /etc/httpd/conf/httpd.conf: @@ -113,14 +122,12 @@ Note: ==> Disable php with mysql if it isn't needed with others servers, ==> comment that lines in /etc/php/php.ini: - # extension=ftp.so - # extension=gd.so - # extension=gettext.so - # extension=mcrypt.so - # extension=openssl.so - # extension=pdo_mysql.so - # extension=sockets.so - # extension=zip.so + # extension=ftp + # extension=gd + # extension=gettext + # extension=pdo_mysql + # extension=sockets + # extension=zip # "date.timezone = <my_country>/<my_city>" ==> Remove log files and "zoneminder" directory in "/var/log/zoneminder". diff --git a/zoneminder.service b/zoneminder.service index 48268f1391d8..46ec4b2452df 100644 --- a/zoneminder.service +++ b/zoneminder.service @@ -1,7 +1,7 @@ [Unit] -Description=ZoneMinder CCTV recording and security system -After=network.target mysqld.service httpd.service -Requires=mysqld.service httpd.service +Description=ZoneMinder - CCTV Monitoring and Recording System +After=network.target mariadb.service +Wants=mariadb.service [Service] User=http @@ -10,6 +10,7 @@ ExecStart=/usr/bin/zmpkg.pl start ExecReload=/usr/bin/zmpkg.pl restart ExecStop=/usr/bin/zmpkg.pl stop PIDFile=/run/zoneminder/zm.pid +Environment=TZ=:/etc/localtime [Install] WantedBy=multi-user.target |