Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
puppet-icinga2_testing
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
15
Issues
15
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
testing
puppet-icinga2_testing
Commits
9a8663b0
Commit
9a8663b0
authored
Nov 17, 2017
by
Markus Frosch
📣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "icingaweb2: Remove old php when using fpm"
This reverts commit
28977e14
parent
33bb392b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
11 deletions
+0
-11
manifests/profiles/icingaweb2.pp
manifests/profiles/icingaweb2.pp
+0
-11
No files found.
manifests/profiles/icingaweb2.pp
View file @
9a8663b0
...
...
@@ -6,12 +6,9 @@ class icinga2_testing::profiles::icingaweb2 {
Package
[
'centos-release-scl'
]
->
Class
[
'::icingaweb2'
]
$_use_fpm
=
true
$_remove_php
=
true
$_php_common
=
'php-common'
$_fpm_service
=
'rh-php71-php-fpm'
}
else
{
$_use_fpm
=
false
$_remove_php
=
false
}
if
$_use_fpm
{
...
...
@@ -24,14 +21,6 @@ class icinga2_testing::profiles::icingaweb2 {
}
}
if
$_remove_php
{
package
{
'php-common'
:
ensure
=>
absent
,
name
=>
$_php_common
,
require
=>
Package
[
'icingaweb2'
],
}
}
include
::apache
::
apache::custom_config
{
'icingaweb2'
:
content
=>
template
(
'icinga2_testing/icingaweb2/apache2.conf.erb'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment