7451 Commits

Author SHA1 Message Date
Eric Lippmann
a259b0cfa9 RPM/php-fpm: Support nginx only on Red Hat Linux
refs #9669
2015-07-28 15:50:47 +02:00
Eric Lippmann
827bb5ddbf RPM: Install all error html files
refs #9669
2015-07-28 15:26:50 +02:00
Eric Lippmann
946f2dc5a8 RPM: Rename httpd/icingaweb2.conf to httpd/icingaweb2-mod_proxy_fcgi.conf
refs #9669
2015-07-28 15:25:30 +02:00
Eric Lippmann
ab9901d64d RPM/php-fpm: Don't support php-fpm installations on SUSE
mod_proxy_fcgi seems missing.

refs #9669
2015-07-28 15:22:34 +02:00
Eric Lippmann
5028a26670 RPM/httpd and mod_php: Load error html if mod_php is disabled
refs #9669
2015-07-28 15:21:53 +02:00
Eric Lippmann
284db3bd22 RPM: Fix httpd php-fpm config
refs #9669
2015-07-28 15:21:12 +02:00
Eric Lippmann
4ae3a8568a RPM/httpd and php-fpm: Load error html if mod_proxy is disabled
refs #9669
2015-07-28 15:19:55 +02:00
Eric Lippmann
e068fab4fd Provide error html file if mod_proxy is disabled
refs #9669
2015-07-28 15:18:46 +02:00
Eric Lippmann
a77a9468f1 Provide error html file if mod_php disabled
refs #9669
2015-07-28 15:18:22 +02:00
Eric Lippmann
e77bb737f0 RPM: Move apache/icingaweb2-mod_php.conf to httpd/icingaweb2-mod_php.conf
refs #9669
2015-07-28 15:15:41 +02:00
Eric Lippmann
a2f2926d1d RPM: Rename apache/icingaweb2.conf to apache/icingaweb2-mod_php.conf
refs #9669
2015-07-28 15:15:00 +02:00
Eric Lippmann
56472e9076 RPM/php-fpm: Let -php-fpm-config require -common
refs #9669
2015-07-28 14:33:01 +02:00
Eric Lippmann
30be53b44a RPM/php-fpm: Restructure RPM
refs #9669
2015-07-28 14:31:26 +02:00
Eric Lippmann
3fc00e66f6 RPM/php-fpm: Provide php-fpm-config package
refs #9669
2015-07-28 14:22:34 +02:00
Eric Lippmann
054c7b407b RPM/php-fpm: Call a2enmod rewrite on SLES/OpenSUSE
refs #9669
2015-07-24 13:15:47 +02:00
Eric Lippmann
0c01ac9444 RPM/php-fpm: Clean up dependencies
refs #9669
2015-07-24 11:43:12 +02:00
Eric Lippmann
c019636037 RPM/php-fpm: Package vendor-Zend again
refs #9669
2015-07-24 10:13:14 +02:00
Eric Lippmann
27cccc6853 Revert "No longer package Zend as vendor library"
This reverts commit b2c22ebcf9b5f1ddfcbd145ac81bd742e3fc8797.

Let's use our vendor package for Zend for SuSe again :)

refs #9669
2015-07-24 10:09:32 +02:00
Eric Lippmann
f50f7bed70 RPM/php-fpm: Don't require Zend explicitly
refs #9669
2015-07-24 10:08:14 +02:00
Eric Lippmann
490e1e36b9 RPM/php-fpm: Don't try to add the icingaweb2 user twice
refs #9669
2015-07-23 16:59:01 +02:00
Eric Lippmann
4528af1a78 RPM/php-fpm: Install php-ldap too
refs #9669
2015-07-23 16:58:10 +02:00
Eric Lippmann
545a5abf11 RPM/php-fpm: Don't require php for vendor libraries
refs #9669
2015-07-23 16:57:44 +02:00
Eric Lippmann
9f8eb15ed7 RPM: Fix undef variable nginx_confdir
refs #9669
2015-07-23 16:07:44 +02:00
Eric Lippmann
6879942d4d RPM: Add spec file that installs Web 2 using php-fpm (WIP)
refs #9669
2015-07-23 15:58:52 +02:00
Eric Lippmann
54b2c38c89 RPM: Add php-fpm pool config for Web 2
refs #9669
2015-07-23 15:58:16 +02:00
Eric Lippmann
56b9df5225 RPM: Add php-fpm compatible nginx config
refs #9669
2015-07-23 15:58:05 +02:00
Eric Lippmann
b3083ea39c RPM: Add php-fpm compatible apache config
refs #9669
2015-07-23 15:57:53 +02:00
Eric Lippmann
593f90f330 Puppet: Fix that the LDAP server is empty when using CentOS 7 2015-07-23 12:40:51 +02:00
Eric Lippmann
b4861fe689 Puppet: Set date.timezone for PHP in a separate INI file 2015-07-23 12:40:12 +02:00
Eric Lippmann
af6def7d7f Puppet: Use strings for file modes 2015-07-23 12:39:36 +02:00
Eric Lippmann
67af7b5135 Puppet: Don't install icinga2-debuginfo 2015-07-23 12:39:12 +02:00
Eric Lippmann
3ffe657f71 Puppet: Use future parser 2015-07-23 12:37:23 +02:00
Johannes Meyer
1d3a0f63eb BackendConfigForm: Fix that skipping the schema validation is not possible
fixes #9719
2015-07-23 12:25:30 +02:00
Eric Lippmann
910dee199f Fix form test 2015-07-22 14:21:53 +02:00
Eric Lippmann
63c51c01e0 monitoring: Auto-refresh tactical overview every 15 seconds
fixes #9626
2015-07-22 13:40:50 +02:00
Eric Lippmann
13d954a956 Fix rawurlencode call 2015-07-22 13:36:25 +02:00
Eric Lippmann
b8c2c33086 Merge branch 'feature/vagrant-centos-7-9453'
resolves #9453
2015-07-22 13:35:18 +02:00
Eric Lippmann
52e352751e Revert "ModuleActionController: fix forward/X-Icinga-Module"
This reverts commit bf82bd4ce1827361a039cbebb272df81584044e5.

We have a not merged branch for this.

refs #9349
2015-07-22 13:34:44 +02:00
Markus Frosch
ab8e775188 Fix duplicate headers on forward() inside a controller
This avoids that the JS loader flattening arrays.

refs #9349
2015-07-22 13:34:44 +02:00
Johannes Meyer
1e9ce1d0d5 Merge branch 'feature/support-for-file-uploads-8758'
resolves #8758
2015-07-22 13:32:17 +02:00
Johannes Meyer
54a77b7253 Merge branch 'master' into feature/support-for-file-uploads-8758 2015-07-22 13:30:56 +02:00
Johannes Meyer
0f2351ff1d js: Fix XHR loading of URLs in case window.FormData is not supported
refs #8758
2015-07-22 13:29:44 +02:00
Johannes Meyer
a199d36207 Stylesheet: Disable extendend @import statements provided by LESS
fixes #9687
2015-07-22 12:45:10 +02:00
Thomas Gelf
c5d68995ec forms.less: top-align field lables and related...
...items like icons. They used to be bottom-aligned, resulting in
slightly confusing form layouts when text areas where involved.
2015-07-22 11:03:01 +02:00
Thomas Gelf
d44547e469 forms.less: textarea should look like other inputs 2015-07-22 10:57:14 +02:00
Thomas Gelf
bf82bd4ce1 ModuleActionController: fix forward/X-Icinga-Module 2015-07-22 10:53:42 +02:00
Johannes Meyer
cecd94be50 Merge branch 'master' into feature/support-for-file-uploads-8758 2015-07-22 08:47:24 +02:00
Johannes Meyer
c0de2e6ee3 Form: Add missing use statement for the ProgrammingError exception 2015-07-22 08:39:24 +02:00
Eric Lippmann
45ef285e3d RPM: Let php-Icinga require Zend and Zend's MySQL and PostgreSQL adapters
This installs both the MySQL and PostgreSQL libs even if the user only wants to use either MySQL or PostgreSQL. But the depencies installed--mysql-libs and postgresql-libs respectively--are so minimal that this is a good trade off for managing our dependencies atm.

fixes #9314
2015-07-21 17:32:17 +02:00
Eric Lippmann
ce2b686252 Add file and line of logged menu item renderer exceptions
fixes #9696
2015-07-21 16:54:23 +02:00