Accepting request 875941 from network:utilities
OBS-URL: https://build.opensuse.org/request/show/875941 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/matomo?expand=0&rev=28
This commit is contained in:
commit
f4bcb7dd29
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:63a3a36ee15893665232c24e2918786dffa8f73fe7026807381f8570d2d9e63e
|
|
||||||
size 16134429
|
|
3
matomo-4.2.1.tar.gz
Normal file
3
matomo-4.2.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d3ea7572c5b42f2636da89b9c15dd7ae16da1d06dab0cea2ed93304a960277ac
|
||||||
|
size 14839954
|
@ -59,3 +59,7 @@ For cron you must uncomment the line in /etc/cron.d/matomo-archive
|
|||||||
For systemd.timer you must start and enable matomo-archive.timer:
|
For systemd.timer you must start and enable matomo-archive.timer:
|
||||||
~# /usr/bin/systemctl enable --now matomo-archive.timer
|
~# /usr/bin/systemctl enable --now matomo-archive.timer
|
||||||
|
|
||||||
|
g) Enable infile
|
||||||
|
- GRANT FILE ON *.* TO '<your_matomo_user>'@'localhost'
|
||||||
|
- usermod -a -G www mysql
|
||||||
|
- systemctl restart mysql apache2
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# without CLI
|
# without CLI
|
||||||
#-5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log
|
#-5 * * * * @APACHE_USER@ /usr/bin/php @APACHE_SERVERROOT@/matomo/misc/cron/archive.php --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log
|
||||||
|
|
||||||
# with CLI
|
# with CLI
|
||||||
-5 * * * * wwwrun /usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log
|
-5 * * * * @APACHE_USER@ /usr/bin/php @APACHE_SERVERROOT@/matomo/console core:archive --url=http://localhost/matomo/ > /var/log/matomo/matomo-archive.log
|
||||||
|
@ -3,8 +3,8 @@ Description=Auto-Archiving of matomo Reports
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
User=wwwrun
|
User=@APACHE_USER@
|
||||||
Group=www
|
Group=@APACHE_GROUP@
|
||||||
ExecStart=/bin/bash -ce "/usr/bin/php @ap_serverroot@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1"
|
ExecStart=/bin/bash -ce "/usr/bin/php @APACHE_SERVERROOT@/matomo/console core:archive --url=http://localhost/matomo/ >> /var/log/matomo/matomo-archive.log 2>&1"
|
||||||
#StandardOutput=file:/var/log/matomo/matomo-archive.log
|
#StandardOutput=file:/var/log/matomo/matomo-archive.log
|
||||||
#StandardError=file:/var/log/matomo/matomo-archive.log
|
#StandardError=file:/var/log/matomo/matomo-archive.log
|
||||||
|
15
matomo-package_update.patch
Normal file
15
matomo-package_update.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff -Pdpru matomo.orig/plugins/CoreUpdater/Commands/Update.php matomo/plugins/CoreUpdater/Commands/Update.php
|
||||||
|
--- matomo.orig/plugins/CoreUpdater/Commands/Update.php 2020-11-23 20:20:18.000000000 +0100
|
||||||
|
+++ matomo/plugins/CoreUpdater/Commands/Update.php 2020-11-24 14:16:58.087597130 +0100
|
||||||
|
@@ -70,7 +70,11 @@ class Update extends ConsoleCommand
|
||||||
|
$this->writeSuccessMessage($output, array(Piwik::translate('CoreUpdater_DbUpgradeNotExecuted')));
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Only show if autoupdate is enabled. Don't show if update through distribution package update.
|
||||||
|
+ $enableAutoUpdate = (bool) Config::getInstance()->General['enable_auto_update'];
|
||||||
|
+ if ($enableAutoUpdate === true){
|
||||||
|
$this->writeAlertMessageWhenCommandExecutedWithUnexpectedUser($output);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
|
||||||
|
} catch(NoUpdatesFoundException $e) {
|
@ -1,3 +1,100 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 1 08:24:34 UTC 2021 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.2.1
|
||||||
|
To many changes, so look at:
|
||||||
|
https://github.com/matomo-org/matomo/releases/tag/4.2.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 22 10:22:36 UTC 2021 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.2.0
|
||||||
|
To many changes, so look at:
|
||||||
|
https://github.com/matomo-org/matomo/releases/tag/4.2.0
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 15 06:42:06 UTC 2021 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.1.1
|
||||||
|
To many changes, so look at:
|
||||||
|
https://github.com/matomo-org/matomo/releases/tag/4.1.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 22 08:24:09 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.1.0
|
||||||
|
- No changelog from upstream at this time.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 14 10:02:54 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Put apache configuration files in separate subpackages.
|
||||||
|
- Update cron, service, lograte files with apache macros.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 9 06:34:40 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.0.5
|
||||||
|
- Avoid inserting duplicates in invalidation table to reduce IO.
|
||||||
|
- Limit to given sites to not select too much.
|
||||||
|
- fix build
|
||||||
|
- tweaks to duplicate checking query
|
||||||
|
- more pr feedback
|
||||||
|
- fix cron archive test
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Dec 4 06:54:37 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.0.4
|
||||||
|
- No changelog from upstream.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Dec 2 10:46:45 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Use apache-rpm-macros.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Nov 28 09:15:51 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.0.2
|
||||||
|
No changelog from upstream but you can see changes since 4.0.1
|
||||||
|
here: https://github.com/matomo-org/matomo/compare/4.0.1...4.0.2
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 27 06:35:41 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.0.1
|
||||||
|
* matomo-org/matomo
|
||||||
|
- #16778 SEO Plugin broken
|
||||||
|
- #16788 CLI Archive might not stop
|
||||||
|
- #16786 No custom dimensions in Matomo 4.0.0
|
||||||
|
- #16798 Error upgrading db while upgrading to 4.0.0-b1
|
||||||
|
(session update fails)
|
||||||
|
- #16804 Matomo 4.0.0 warns about “ExampleTheme requires
|
||||||
|
Piwik <4.0.0-b1”
|
||||||
|
* matomo-org/device-detector
|
||||||
|
- #6443 Detect browsers: Slimjet, 7Star, MxNitro
|
||||||
|
- #6444 Detect new brands: Starlight, GEOFOX, Verico, Tinmo,
|
||||||
|
Matrix and Detect devices for existing brands: Asus, Sharp,
|
||||||
|
Coolpad, Sony, OPPO, Lenovo, Philips, Vivo, Xiaomi,
|
||||||
|
Manta Multimedia, NEC, Vernee, Karbonn, Krüger&Matz, RugGear,
|
||||||
|
DEXP, Digma, MiXzo, Atom, Yu, Acer, Irbis, teXet, Telefunken,
|
||||||
|
Onda, IconBIT, Polaroid, Doogee, Allview, BB Mobile,
|
||||||
|
Touchmate, ArmPhone, Memup, Kazam, ZTE, Odys, Jinga, Ginzzu,
|
||||||
|
iLife, Mobicel, Blu, Blaupunkt
|
||||||
|
#6448 Detect Crazy Browser
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 24 11:58:12 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 4.0.0
|
||||||
|
Too many changes to list here. See instead:
|
||||||
|
https://github.com/matomo-org/matomo/releases/tag/4.0.0
|
||||||
|
|
||||||
|
- Fix boo#1162178:
|
||||||
|
Add matomo-package_update.patch to not show warning message when
|
||||||
|
auto_update_enable es disable through package installation.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 5 05:56:59 UTC 2020 - ecsos <ecsos@opensuse.org>
|
Mon Oct 5 05:56:59 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/var/log/matomo/matomo-archive.log
|
/var/log/matomo/matomo-archive.log
|
||||||
{
|
{
|
||||||
su wwwrun www
|
su @APACHE_USER@ @APACHE_GROUP@
|
||||||
rotate 30
|
rotate 30
|
||||||
daily
|
daily
|
||||||
missingok
|
missingok
|
||||||
|
141
matomo.spec
141
matomo.spec
@ -18,21 +18,10 @@
|
|||||||
|
|
||||||
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
|
# See also http://en.opensuse.org/openSUSE:Specfile_guidelines
|
||||||
|
|
||||||
%define apxs %{_sbindir}/apxs2
|
|
||||||
%define ap_sysconfdir %(%{apxs} -q SYSCONFDIR)
|
|
||||||
%define ap_serverroot %(%{apxs} -q PREFIX)
|
|
||||||
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
%define ap_usr wwwrun
|
|
||||||
%define ap_grp www
|
|
||||||
%else
|
|
||||||
%define ap_usr nobody
|
|
||||||
%define ap_grp nogroup
|
|
||||||
%endif
|
|
||||||
%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
|
%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
|
||||||
|
|
||||||
Name: matomo
|
Name: matomo
|
||||||
Version: 3.14.1
|
Version: 4.2.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Web analytics platform
|
Summary: Web analytics platform
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -48,23 +37,25 @@ Source12: %{name}-archive.timer
|
|||||||
Source13: %{name}.my.cnf
|
Source13: %{name}.my.cnf
|
||||||
Source14: %{name}-tmpfile.conf
|
Source14: %{name}-tmpfile.conf
|
||||||
Source99: %{name}.rpmlintrc
|
Source99: %{name}.rpmlintrc
|
||||||
|
# PATCH-FIX-OPENSUSE: Don't show wrong message with wrong owner of %%{apache_serverroot}/%%{name} when disable enable_auto_update through package installation.
|
||||||
|
Patch1: %{name}-package_update.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
Requires(pre): user(%ap_usr)
|
Requires(pre): user(wwwrun)
|
||||||
Requires(pre): group(%ap_grp)
|
Requires(pre): group(www)
|
||||||
%else
|
%else
|
||||||
Requires(pre): aaa_base
|
Requires(pre): aaa_base
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: apache2-devel
|
BuildRequires: apache-rpm-macros
|
||||||
BuildRequires: cron
|
BuildRequires: cron
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: logrotate
|
BuildRequires: logrotate
|
||||||
BuildRequires: mariadb
|
BuildRequires: mariadb
|
||||||
BuildRequires: unzip
|
BuildRequires: unzip
|
||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
Requires: apache2
|
Requires: nodejs
|
||||||
|
Requires: python3
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
Requires: mod_php_any >= 5.5.9
|
|
||||||
Requires: php-ctype
|
Requires: php-ctype
|
||||||
Requires: php-curl
|
Requires: php-curl
|
||||||
Requires: php-dom
|
Requires: php-dom
|
||||||
@ -85,7 +76,6 @@ Requires(pre): php
|
|||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
Recommends: php-geoip
|
Recommends: php-geoip
|
||||||
Recommends: php-openssl
|
Recommends: php-openssl
|
||||||
Recommends: apache2-mod_geoip
|
|
||||||
Recommends: mariadb
|
Recommends: mariadb
|
||||||
Recommends: cron
|
Recommends: cron
|
||||||
Conflicts: piwik
|
Conflicts: piwik
|
||||||
@ -95,8 +85,21 @@ Matomo, formerly Piwik, is a web analytics platform that gives
|
|||||||
insights into a website's visitors and marketing campaigns, so the
|
insights into a website's visitors and marketing campaigns, so the
|
||||||
strategy and online experience of visitors may be optimized.
|
strategy and online experience of visitors may be optimized.
|
||||||
|
|
||||||
|
%package apache
|
||||||
|
Summary: Apache configuration for %{name}
|
||||||
|
Group: Productivity/Networking/Web/Utilities
|
||||||
|
BuildRequires: apache2
|
||||||
|
Requires: apache2
|
||||||
|
Requires: mod_php_any >= 7.2.5
|
||||||
|
Recommends: apache2-mod_geoip
|
||||||
|
Supplements: packageand(apache2:%name)
|
||||||
|
|
||||||
|
%description apache
|
||||||
|
This subpackage contains the Apache configuration files
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}
|
%setup -q -n %{name}
|
||||||
|
%patch1 -p1
|
||||||
install -m644 %{SOURCE4} README.SUSE
|
install -m644 %{SOURCE4} README.SUSE
|
||||||
# remove unwanted files
|
# remove unwanted files
|
||||||
find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -delete
|
find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -delete
|
||||||
@ -104,6 +107,7 @@ find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -de
|
|||||||
find . -type f "(" -name "*.c" -o -name "*.h" -o -name "*.js.orig" ")" -delete
|
find . -type f "(" -name "*.c" -o -name "*.h" -o -name "*.js.orig" ")" -delete
|
||||||
# env-script-interpreter
|
# env-script-interpreter
|
||||||
find . -type f -exec sed -i -e 's|\/usr\/bin\/env php|\/usr\/bin\/php|g' {} +
|
find . -type f -exec sed -i -e 's|\/usr\/bin\/env php|\/usr\/bin\/php|g' {} +
|
||||||
|
find . -type f -name "*.sh" -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} +
|
||||||
|
|
||||||
#
|
#
|
||||||
# disable the auto updater, it can't work properly with the new, more secure permissions and is a bad idea on a RPM based setup anyways.
|
# disable the auto updater, it can't work properly with the new, more secure permissions and is a bad idea on a RPM based setup anyways.
|
||||||
@ -118,7 +122,7 @@ do
|
|||||||
sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php
|
sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php
|
||||||
done
|
done
|
||||||
# Insert new hashes for chanded files
|
# Insert new hashes for chanded files
|
||||||
for file in console 'vendor/leafo/lessphp/plessc' 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php'
|
for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc'
|
||||||
do
|
do
|
||||||
size=$(ls -l $file | awk '{ print $5 }')
|
size=$(ls -l $file | awk '{ print $5 }')
|
||||||
checksum=$(md5sum $file | awk '{ print $1 }')
|
checksum=$(md5sum $file | awk '{ print $1 }')
|
||||||
@ -131,8 +135,8 @@ done
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
# make directories
|
# make directories
|
||||||
install -d -m0755 %{buildroot}/%{ap_serverroot}/%{name}
|
install -d -m0755 %{buildroot}/%{apache_serverroot}/%{name}
|
||||||
install -d -m0755 %{buildroot}/%{ap_serverroot}/%{name}/tmp
|
install -d -m0755 %{buildroot}/%{apache_serverroot}/%{name}/tmp
|
||||||
install -d -m0755 %{buildroot}/%{_sysconfdir}/%{name}
|
install -d -m0755 %{buildroot}/%{_sysconfdir}/%{name}
|
||||||
install -d -m0755 %{buildroot}/%{_defaultdocdir}/%{name}
|
install -d -m0755 %{buildroot}/%{_defaultdocdir}/%{name}
|
||||||
# copy src from build to buildroot
|
# copy src from build to buildroot
|
||||||
@ -141,20 +145,22 @@ mv LEGALNOTICE %{buildroot}/%{_defaultdocdir}/%{name}
|
|||||||
mv LICENSE %{buildroot}/%{_defaultdocdir}/%{name}
|
mv LICENSE %{buildroot}/%{_defaultdocdir}/%{name}
|
||||||
mv "misc/How to install Matomo.html" %{buildroot}/%{_defaultdocdir}/%{name}
|
mv "misc/How to install Matomo.html" %{buildroot}/%{_defaultdocdir}/%{name}
|
||||||
mv *md %{buildroot}/%{_defaultdocdir}/%{name}
|
mv *md %{buildroot}/%{_defaultdocdir}/%{name}
|
||||||
cp -dR * %{buildroot}/%{ap_serverroot}/%{name}
|
cp -dR * %{buildroot}/%{apache_serverroot}/%{name}
|
||||||
# install matomo.conf to apache conf.d
|
# install matomo.conf to apache conf.d
|
||||||
mkdir -p %{buildroot}/%{ap_sysconfdir}/conf.d
|
mkdir -p %{buildroot}/%{apache_sysconfdir}/conf.d
|
||||||
sed -e 's|__matomo_web__|%{ap_serverroot}/%{name}|g' \
|
sed -e 's|__matomo_web__|%{apache_serverroot}/%{name}|g' \
|
||||||
-e 's|__matomo_conf__|%{_sysconfdir}/%{name}|g' \
|
-e 's|__matomo_conf__|%{_sysconfdir}/%{name}|g' \
|
||||||
-e 's|__matomo_log__|/var/log/%{name}|g' \
|
-e 's|__matomo_log__|/var/log/%{name}|g' \
|
||||||
%{SOURCE2} > %{buildroot}/%{ap_sysconfdir}/conf.d/%{name}.conf
|
%{SOURCE2} > %{buildroot}/%{apache_sysconfdir}/conf.d/%{name}.conf
|
||||||
# install logrotate
|
# install logrotate
|
||||||
install -D -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
|
install -D -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
|
||||||
|
sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
|
||||||
|
sed -i -e 's|@APACHE_GROUP@|%{apache_group}|g' %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
|
||||||
# move config to etc/matomo and make symlink
|
# move config to etc/matomo and make symlink
|
||||||
mv %{buildroot}/%{ap_serverroot}/%{name}/config/* \
|
mv %{buildroot}/%{apache_serverroot}/%{name}/config/* \
|
||||||
%{buildroot}/%{_sysconfdir}/%{name}
|
%{buildroot}/%{_sysconfdir}/%{name}
|
||||||
rm -d %{buildroot}/%{ap_serverroot}/%{name}/config
|
rm -d %{buildroot}/%{apache_serverroot}/%{name}/config
|
||||||
ln -s %{_sysconfdir}/%{name} %{buildroot}/%{ap_serverroot}/%{name}/config
|
ln -s %{_sysconfdir}/%{name} %{buildroot}/%{apache_serverroot}/%{name}/config
|
||||||
# install cronscript and systemd-timer
|
# install cronscript and systemd-timer
|
||||||
install -d -m 0755 %{buildroot}/%{_sysconfdir}/cron.d
|
install -d -m 0755 %{buildroot}/%{_sysconfdir}/cron.d
|
||||||
install -d -m 0755 %{buildroot}/var/log/%{name}
|
install -d -m 0755 %{buildroot}/var/log/%{name}
|
||||||
@ -162,8 +168,11 @@ install -D -m 0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name}-archiv
|
|||||||
install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service
|
install -D -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/%{name}-archive.service
|
||||||
install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer
|
install -D -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}-archive.timer
|
||||||
install -D -m 0644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
install -D -m 0644 %{SOURCE14} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive
|
sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive
|
||||||
sed -i -e 's|@ap_serverroot@|%{ap_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service
|
sed -i -e 's|@APACHE_SERVERROOT@|%{apache_serverroot}|g' %{buildroot}%{_sysconfdir}/cron.d/%{name}-archive
|
||||||
|
sed -i -e 's|@APACHE_USER@|%{apache_user}|g' %{buildroot}%{_unitdir}/%{name}-archive.service
|
||||||
|
sed -i -e 's|@APACHE_GROUP@|%{apache_group}|g' %{buildroot}%{_unitdir}/%{name}-archive.service
|
||||||
|
sed -i -e 's|@APACHE_SERVERROOT@|%{apache_serverroot}|g' %{buildroot}%{_unitdir}/%{name}-archive.service
|
||||||
# install changes for mariadb
|
# install changes for mariadb
|
||||||
install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cnf
|
install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cnf
|
||||||
|
|
||||||
@ -175,17 +184,17 @@ install -D -m0644 %{SOURCE13} %{buildroot}/%{_sysconfdir}/my.cnf.d/%{name}.my.cn
|
|||||||
|
|
||||||
%post
|
%post
|
||||||
# BSC#1154324
|
# BSC#1154324
|
||||||
# # # chown -R %{ap_usr}:%{ap_grp} %{ap_serverroot}/%{name}
|
# # # chown -R %{apache_user}:%{apache_group} %{apache_serverroot}/%{name}
|
||||||
%service_add_post matomo-archive.timer matomo-archive.service apache2.service
|
%service_add_post matomo-archive.timer matomo-archive.service apache2.service
|
||||||
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
|
||||||
if [ $1 -gt 1 ]; then
|
if [ $1 -gt 1 ]; then
|
||||||
# Update matomo if this is an upgrade $1 == 2
|
# Update matomo if this is an upgrade $1 == 2
|
||||||
echo "matomo: Update matomo:core..."
|
echo "matomo: Update matomo:core..."
|
||||||
su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || :
|
su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || :
|
||||||
su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || :
|
su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || :
|
||||||
su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console core:update --yes" || :
|
su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console core:update --yes" || :
|
||||||
su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || :
|
su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || :
|
||||||
su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || :
|
su %{apache_user} -s /bin/sh -c "%{_bindir}/php %{apache_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || :
|
||||||
:
|
:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -199,43 +208,43 @@ fi
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%dir %{_defaultdocdir}/%{name}
|
%dir %{_defaultdocdir}/%{name}
|
||||||
%{_defaultdocdir}/%{name}/*
|
%{_defaultdocdir}/%{name}/*
|
||||||
%config(noreplace) %{ap_sysconfdir}/conf.d/%{name}.conf
|
|
||||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||||
%config(noreplace) %{_sysconfdir}/cron.d/%{name}-archive
|
%config(noreplace) %{_sysconfdir}/cron.d/%{name}-archive
|
||||||
%config(noreplace) %{_sysconfdir}/my.cnf.d/%{name}.my.cnf
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/%{name}.my.cnf
|
||||||
%{_unitdir}/%{name}-archive.service
|
%{_unitdir}/%{name}-archive.service
|
||||||
%{_unitdir}/%{name}-archive.timer
|
%{_unitdir}/%{name}-archive.timer
|
||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/environment
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/environment
|
||||||
%attr(0640,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/*.php
|
%attr(0640,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/*.php
|
||||||
%attr(0640,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/environment/*.php
|
%attr(0640,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/environment/*.php
|
||||||
%ghost %attr(0750,%{ap_usr},%{ap_grp}) /run/%{name}_sessions
|
%ghost %attr(0750,%{apache_user},%{apache_group}) /run/%{name}_sessions
|
||||||
%defattr(644,root,root,755)
|
%defattr(644,root,root,755)
|
||||||
%dir %{ap_serverroot}/%{name}
|
%dir %{apache_serverroot}/%{name}
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/js
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/js
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/plugins
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/plugins
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/tmp
|
%dir %attr(0750,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/tmp
|
||||||
%dir %attr(0750,%{ap_usr},%{ap_grp}) /var/log/%{name}
|
%dir %attr(0750,%{apache_user},%{apache_group}) /var/log/%{name}
|
||||||
%config(noreplace) %attr(600,%{ap_usr},%{ap_grp}) %{_sysconfdir}/%{name}/*php
|
%config(noreplace) %attr(600,%{apache_user},%{apache_group}) %{_sysconfdir}/%{name}/*php
|
||||||
%{_sysconfdir}/%{name}/environment/*php
|
%{_sysconfdir}/%{name}/environment/*php
|
||||||
%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/matomo.js
|
%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/matomo.js
|
||||||
%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/piwik.js
|
%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/piwik.js
|
||||||
%attr(0644,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/js/piwik.min.js
|
%attr(0644,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/js/piwik.min.js
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/console
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/console
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/cron/archive.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/cron/archive.sh
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/log-analytics/import_logs.py
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/log-analytics/import_logs.py
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/clean-xhprof.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/clean-xhprof.sh
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/build-xhprof.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/misc/composer/build-xhprof.sh
|
||||||
#%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/plugins/TestRunner/scripts/on_instance_launch.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/package.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/lessify
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/plessc
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/pear/archive_tar/sync-php4
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh
|
%attr(0770,%{apache_user},%{apache_group}) %{apache_serverroot}/%{name}/vendor/wikimedia/less.php/bin/lessc
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
|
%{apache_serverroot}/%{name}/*
|
||||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh
|
|
||||||
%{ap_serverroot}/%{name}/*
|
%files apache
|
||||||
|
%config(noreplace) %{apache_sysconfdir}/conf.d/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user