166 Commits

Author SHA1 Message Date
Markus Frosch
814104d6cf icingaweb2: Properly remove FPM patches 2018-01-22 09:40:55 +01:00
Markus Frosch
1592bf13ba icingaweb2: Remove Apache FPM patches for >= 2.5.1 2017-12-18 15:18:09 +01:00
Eric Lippmann
cd7506ee01 Icinga Web 2: FPM: Support both Apache >= 2.4 and Apache < 2.4 2017-11-29 14:39:36 +01:00
Eric Lippmann
7d64cc21be Revert "icingaweb2: Remove apache fpm config patch after 2.5.0"
This reverts commit d39db6a99a5be08a6c0e5452a4add0b1e212219d.

Snapshot branch is always merged into the release branch. We have to introduce another build fix for 2.5.0 so this commit has to be reverted.
2017-11-29 14:36:25 +01:00
Markus Frosch
4ef2c24102 icingaweb2: Remove apache fpm config patch after 2.5.0 2017-11-28 13:45:44 +01:00
Markus Frosch
f09d2c5d46 Merge branch 'rpm/snapshot' into rpm/icingaweb2-fix-apache-fpm-config 2017-11-28 13:43:59 +01:00
Eric Lippmann
fb9d3258a4 Icinga Web 2: Fix Apache FPM config 2017-11-28 12:17:53 +01:00
Eric Lippmann
f782f0f49e Icinga Web 2: Install error_unavailable.html 2017-11-28 10:32:05 +01:00
Markus Frosch
d997896fd1 Prepare release icingaweb2 2.5.0-1 2017-11-27 09:51:05 +01:00
Markus Frosch
4c6730eafe icingaweb2: Start php-fpm on Fedora >= 27 2017-11-24 17:21:19 +01:00
Markus Frosch
2c81f71a5b icingaweb2: Refactor SELinux handling
Dropping policyhelp for Fedora 27, was only needed on Fedora < 20, and EL < 7

See https://fedoraproject.org/wiki/SELinux_Policy_Modules_Packaging_Draft
2017-11-24 16:56:52 +01:00
Markus Frosch
ebb0b85851 icingaweb2: Require common DB and LDAP modules on RHEL 2017-11-21 14:39:32 +01:00
Markus Frosch
b2f550330c icingaweb2: Install mod_proxy_fcgi on testing CentOS 6 2017-11-17 14:47:53 +01:00
Markus Frosch
8b54a0f7bd icingaweb2: Fix fpm start in testing 2017-11-17 14:40:59 +01:00
Markus Frosch
7c1a5efb52 icingaweb2: Install httpd in testing CentOS 2017-11-17 14:38:26 +01:00
Markus Frosch
b1f87b3433 icingaweb2: Also detect /etc/centos-release for testing 2017-11-17 14:36:54 +01:00
Markus Frosch
26424dd6aa icingaweb2: Use correct SCL release package name 2017-11-17 14:32:37 +01:00
Markus Frosch
021bb3d7ec icingaweb2: Install SCL before icingaweb2 2017-11-17 14:29:21 +01:00
Markus Frosch
aed711ee4b icingaweb2: Enable SCL with testing on CentOS 2017-11-17 14:25:49 +01:00
Markus Frosch
de4be3eb89 icingaweb2: Add PHP xml and mbstring requires 2017-11-17 13:46:29 +01:00
Markus Frosch
1b4ba49d0d icingaweb2: Add SUSE dependency for system-user-wwwrun
Only on newer versions of Tumbleweed in openSUSE right now.

Needs to be a pre-Requires
2017-11-17 13:46:29 +01:00
Markus Frosch
772119c90c icingaweb2: Also require apache2 on SUSE 2017-11-17 13:46:29 +01:00
Markus Frosch
6f429209dd icingaweb2: Add conflicting dependency with PHP < 5.6.0
Only conflicts will prohibit an installation of older PHP.

The dependency relation via mod_php_any >= x.x.x is not resolved
with the actual required version...
2017-11-17 13:46:29 +01:00
Markus Frosch
5b38709e45 icingaweb2: Remove old SUSE compat 2017-11-17 13:46:29 +01:00
Markus Frosch
ec54de9bc1 icingaweb2: Update testing for FPM and other PHP versions 2017-11-17 13:46:29 +01:00
Markus Frosch
432f33ee0b icingaweb2: Improve dependencies and directory ownerships 2017-11-17 13:46:29 +01:00
Markus Frosch
2a160fedfb icingaweb2: Improve dependencies for SUSE and newer PHP versions 2017-11-16 16:33:25 +01:00
Markus Frosch
87d100f599 icingaweb2: Install fpm config for httpd where needed 2017-11-16 16:33:25 +01:00
Markus Frosch
a9b85f4c06 icingaweb2: Require php from SCL on el7 and el6 2017-11-16 16:33:14 +01:00
Markus Frosch
2f38eb5c78 icingaweb2: Raise PHP version requirement to >= 5.6.0 2017-11-16 16:32:22 +01:00
Markus Frosch
6973cfc257 icingaweb2: Improve PHP runtime and version dependency 2017-11-16 16:32:17 +01:00
Markus Frosch
8d4bbd3f66 icingaweb2: Release 2.4.2-1 2017-09-28 14:12:12 +02:00
Michael Friedrich
720198dc01 Merge branch 'rpm/release' into rpm/snapshot 2017-09-21 15:12:52 +02:00
Markus Frosch
d7187a6bf6 get_snapshot: Add UPSTREAM_GIT_NOREPO to forbid any repo interaction 2017-08-02 11:33:58 +02:00
Markus Frosch
58793929ea get_snapshot: Use UPSTREAM_GIT_BRANCH instead of HEAD 2017-08-02 11:33:58 +02:00
Markus Frosch
d751f7e7d0 get_snapshot: Support UPSTREAM_GIT_NOUPDATE
And do not manage git when set!
2017-08-02 11:33:58 +02:00
Markus Frosch
445f7bdcfa get_snapshot: Add UPSTREAM_GIT_NOREPO to forbid any repo interaction 2017-06-07 15:28:45 +02:00
Markus Frosch
df902f3daf get_snapshot: Use UPSTREAM_GIT_BRANCH instead of HEAD 2017-06-07 15:21:25 +02:00
Markus Frosch
a4543cb1c2 get_snapshot: Support UPSTREAM_GIT_NOUPDATE
And do not manage git when set!
2017-06-07 14:52:17 +02:00
Markus Frosch
910e596397 icingaweb2: Disable mod_lua in testing 2017-06-07 14:13:25 +02:00
Markus Frosch
b984237e8e icingaweb2: Disable mod_lua in testing 2017-06-07 13:58:23 +02:00
Markus Frosch
e210f1e1fe icingaweb2: Disable mod_lua in testing
Can crash on Fedora 25 with Apache 2.4
2017-06-07 13:52:48 +02:00
Markus Frosch
ee9f5723db icingaweb2: Update test to get httpd logs 2017-06-07 11:17:56 +02:00
Markus Frosch
f9547803d7 icingaweb2: Wait for httpd to come up, and output logs on errors 2017-06-06 15:29:43 +02:00
Markus Frosch
0479bcfff5 icingaweb2: Use ipv4 in testing for Fedora 25
fc25 tries to access ::1, even if the container does not have a link
local address...
2017-06-06 15:12:20 +02:00
Markus Frosch
5cf833c4d3 icingaweb2: Ensure updates of vendor-HTMLPurifier 2017-06-06 11:15:58 +02:00
Markus Frosch
27e8c7372c icingaweb2: Remove versioning from vendor packages
fixes #8
2017-05-26 16:55:27 +02:00
Markus Frosch
a36f25fbde icingaweb2: Remove versioning from vendor packages
fixes #8
2017-05-26 16:43:15 +02:00
Markus Frosch
2a2bbc3b75 Disable hardlink again
See https://github.com/Icinga/puppet-icinga_build/issues/11
2017-05-24 16:49:09 +02:00
Markus Frosch
6ddd25f282 Update icinga2 and icingaweb2
Also add diff scripts
2017-05-23 17:00:24 +02:00