Skip to content

Set PHP version to 7.3 for Debian Buster #1932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Conversation

ekohl
Copy link
Collaborator

@ekohl ekohl commented Jul 8, 2019

No description provided.

@sheenaajay
Copy link
Contributor

Thanks for submitting the PR @ekohl
Screen Shot 2019-07-26 at 14 16 23

@lelutin
Copy link

lelutin commented Aug 7, 2019

oh great! thanks @ekohl for this. I have just hit this limitation when upgrading a debian server with apache.

@sheenaajay do you need any feedback to be able to merge this pull request? e.g. some testing, code review? I'd like to see this merged and released to a new version of the module as soon as possible, so if I can give a hand I'll gladly help

@sheenaajay
Copy link
Contributor

Thanks alot @lelutin . Do you want to take a quick look at the changes. I ran the ad-hoc tests and everything is running clean.

Copy link

@lelutin lelutin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This first commit looks fine to me

# major.minor version used since Debian stretch and Ubuntu Xenial
$php_version = '7.2' # different to Ubuntu 16.04
# fastcgi and suphp got removed from #mod_packages, they aren't supported anymore
$mod_packages = {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This list of packages has some differences with the list in the case above (which is being conflated with this elseif case.

fastcgi and suphp are not present in the list here, for ubuntu 18.04, whereas they are present in the list above. it seems as though collapsing these two cases is imposing a change that was not intended?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

er... I apparently don't understand github's interface. I didn't mean to approve this block, but I don't see how to undo this

@ekohl
Copy link
Collaborator Author

ekohl commented Aug 8, 2019

This is labelled as needs-tests but I'm not sure what kind of tests you expect for this. Is there anything I can do to move this forward?

@sheenaajay
Copy link
Contributor

@ekohl @lelutin We need to test the module on Debian Buster before adding and releasing.
Our supported operating systems matrix doesn't include Buster yet. Creating an internal ticket to add and test them on Debian Buster platform. Will let you know the progress.

@ekohl
Copy link
Collaborator Author

ekohl commented Aug 8, 2019

https://tickets.puppetlabs.com/browse/PA-2402 is the one I'm watching. For my personal infra I don't care because I strongly prefer the distro packages over the AIO builds since it doesn't bundle an entire Ruby but it's useful for other things I have to support.

@lelutin
Copy link

lelutin commented Aug 8, 2019

@ekohl in my failed attempts at using the github interface, I raised a question (but the interface might somewhat hide it) : there seems to be a change that's happening for ubuntu 18.04. The comment in the section for that version was saying that fastcgi and suphp are not supported anymore, but the merger of the two if cases brings this back for 18.04 -- was this side-effect intentional?

@ekohl
Copy link
Collaborator Author

ekohl commented Aug 8, 2019

Ah, you're right. That wasn't intended. Those should be dropped because Debian Stretch also doesn't have -fastcgi and -suphp packages. And the same goes for Cosmic and Disco (which is why I unified them).

@lelutin
Copy link

lelutin commented Aug 13, 2019

I don't think I can push a new commit on top of @ekohl 's branch for the PR, but here's the missing commit that would remove the two modules that were not supposed to be brought back (was created with git-format-patch, so you can add this on top of the branch with git am 0001-remove-fastcgi-and-suphp-modules-for-debian-stretch-.patch (or any other file name you give it on your computer)

From 68530a935a965da1d467a5fb31506d89a0533fda Mon Sep 17 00:00:00 2001
From: Gabriel Filion <[email protected]>
Date: Mon, 12 Aug 2019 19:59:53 -0400
Subject: [PATCH] remove fastcgi and suphp modules for debian stretch+ and
 ubuntu bionic+

These two packages don't exist anymore in debian and ubuntu. They were
already removed from the previous "case" block for ubuntu bionic+ but
was erroneously brought back by the previous commit.
---
 manifests/params.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 657d8390..48466d38 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -367,6 +367,7 @@ class apache::params inherits ::apache::version {
         '10'    => '7.3', # Debian Buster
         default => '7.2', # Ubuntu Bionic, Cosmic and Disco
       }
+      # fastcgi and suphp are not packaged anymore in debian or ubuntu
       $mod_packages = {
         'auth_cas'              => 'libapache2-mod-auth-cas',
         'auth_kerb'             => 'libapache2-mod-auth-kerb',
@@ -374,7 +375,6 @@ class apache::params inherits ::apache::version {
         'auth_mellon'           => 'libapache2-mod-auth-mellon',
         'authnz_pam'            => 'libapache2-mod-authnz-pam',
         'dav_svn'               => 'libapache2-mod-svn',
-        'fastcgi'               => 'libapache2-mod-fastcgi',
         'fcgid'                 => 'libapache2-mod-fcgid',
         'geoip'                 => 'libapache2-mod-geoip',
         'intercept_form_submit' => 'libapache2-mod-intercept-form-submit',
@@ -388,7 +388,6 @@ class apache::params inherits ::apache::version {
         'rpaf'                  => 'libapache2-mod-rpaf',
         'security'              => 'libapache2-mod-security2',
         'shib2'                 => 'libapache2-mod-shib2',
-        'suphp'                 => 'libapache2-mod-suphp',
         'wsgi'                  => 'libapache2-mod-wsgi',
         'xsendfile'             => 'libapache2-mod-xsendfile',
       }
-- 
2.20.1

@sheenaajay
Copy link
Contributor

@ekohl @lelutin We have the agents ready and also created a ticket to add the OS to apache module.
Will let you know the testing status. Thank you.

@ekohl
Copy link
Collaborator Author

ekohl commented Aug 30, 2019

Rebased and included the changes suggested by @lulutin

@lelutin
Copy link

lelutin commented Aug 30, 2019

thans @ekohl and @sheenaajay !

@lelutin
Copy link

lelutin commented Aug 30, 2019

hmm I don't understand how the test failures relate to the change in 81f29b6

@ekohl
Copy link
Collaborator Author

ekohl commented Sep 10, 2019

Note sure if it's something I can fix, but The job exceeded the maximum time limit for jobs, and has been terminated. is the current failure on one.

@sheenaajay
Copy link
Contributor

@ekohl Its Travis timeout problem. I have re-kicked the failing job,hopefully it will pass.

@lelutin
Copy link

lelutin commented Sep 10, 2019

@sheenaajay looks like "Job #4556.4" timed out again :\

@ThoughtCrhyme
Copy link
Contributor

@ekohl You'll need to change the acceptance test as I have here: https://github.com/puppetlabs/puppetlabs-apache/pull/1945/files#diff-3ee224d470a0198372cbb4902460df09R30 or else the acceptance tests will fail.

@ekohl
Copy link
Collaborator Author

ekohl commented Sep 12, 2019

Since #1945 was merged and included my fixes this can be closed.

cpitkin pushed a commit to wearefine/puppetlabs-apache that referenced this pull request Apr 1, 2020
fixes https://tickets.puppetlabs.com/browse/MODULES-8903

Add LDAPReferrals configuration parameter

pdksync_heads/master-0-g7827fc2

(MODULES-9104) Add file_mode to config files. (puppetlabs#1922)

- ::apache::file_mode attribute is missing from several config files, including the main config file in ::apache, any custom config files managed by apache::custom_config, and reqtimeout.conf managed by apache::mod::reqtimeout
- Add "mode => $::apache::file_mode" to ::apache, apache::custom_config, and apache::mod::reqtimeout to correct the inability to manage the mode of these config files.
Add LDAP parameters to httpd.conf

(bugfix) Add default package name for mod_ldap (puppetlabs#1913)

* added default package name for mod_ldap

* edited README

* removed selector

* added default package_name for mod_ldap

* changed ldap default package_name in README file

Added unmanaged_path and custom_fragment options to userdir

Added additional tests to spec/classes/userdir_spec.rb

Fixed regex in mod/userdir_spec.rb

pdksync_heads/master-0-gb096033

My first commit to make ProxyRequests a variable to set in hiera. Default is Off. By setting proxy_requests to 'true' it will become 'ProxyRequests On'

probably have to add it it spec/defines/vhost_spec.rb as well

fixed indentation. this is a template, not code... ;-)

Indentation not quite right, this should fix it

added comments about the proxy_requests variable in CHANGELOG.md, HISTORY.md and REFERENCE.md

Explicitly added 'Optional[Boolean]' as data type for proxy_requests variable

This shouldn't be Optional

Corrected data type for proxy_requests to Boolean instead of Any

fixed data type of proxy_requests to Boolean

changed 'ProxyErrorOverride Directive' to 'ProxyRequests Directive' in REFERENCE.md

(FM-8214) converted to use litmus

Fix itk_spec running unnecessarily on el5

more acceptance test setup.

Simplify vhost_spec tests

(MAINT) pdksync: fix for net-ssh 5 host_key check

FM-8140 Add Redhat 8 support

Add owner, group, file_mode and show_diff to apache::custom_config

Set PHP version to 7.3 for Debian Buster

Merge Debian and Ubuntu configs where possible

(FM-8393) add debian 10 to provision.yaml and metadata

(FM-8393-ekohl) fix acceptance test.

MODULES-9083: remove double quotes to allow flags in SSLCARevocationCheck (mod_ssl)

MODULES-9083: add unit test

add possibility to define variables inside VirtualHost definition

The variable can them be used inside the vhost tag as a variable.
At the footer, the variable is undefined to avoid side effects
in other vhosts.

also see https://httpd.apache.org/docs/2.4/mod/core.html#define

(MODULES-9863) 5.1.0 release prep

Add shibboleth support for Debian 10

FIX FastCGI doc on Ubuntu 18.04

(maint) Add a codeowners file

Add parameter version for mod security

We want to be able to select mod security 1 or 2.
Depending on Version, package names and config files are different.

Disable worker, when using prefork mpm

use full path for proxy host in test

MODULES-9904 Fix lbmethod module load order

Under recent apache versions (not sure when changed, but certainly
in 2.4.34), the lbmethod modules depend on symbols present in either
the mod_proxy or mod_proxy_balancer modules. Prior to this commit,
this module creates an `lbmethod_${method}.load` file which comes
alphabetically before `proxy.load` and `proxy_balancer.load`.
Under these recent apache versions, the daemon will therefore fail
to configtest or startup due to the invalid configuration.

This commit adjusts the module load order so that the lbmethod module
is loaded after those its dependent upon.

always quote ExpiresDefault in vhost::directories

this was already done in expires.conf, but not in a vhost

(MAINT) Fix linting errors

(FM-8275) Add vagrant provision list

Prior to this commit the only provisioners included in
the provision lists were docker and vmpooler, neither
of which are particularly accessible to folks developing
on Windows outside of Puppet.

This commit adds a list which leverages the vagrant
provisioner.

Allow switching of thread modules

Usual thread modules are: prefork, event and worker.
When switching from one thread module to another we must ensure that the
old, no longer to use, thread module gets disabled.

Puppet Apache module will always use the new mpm base thread modules and place
them in files without mpm_ prefix.
The a2dismod utility only checks for file names, not the real thread
module.

Point pdk gem to head of master until PDK-1525 resolved

(FM-8662) Correct  in manifests/mod/ssl.pp for SLES 11

(maint) Update for PDK templates

This commit updates the module as per PDK-Templates commit 0b5b39b

(PDK-1501) Allow Travis CI config to be templated

Previously the module unmanaged the Travis CI file when converted to Litmus.
This commit allows the Travis CI file to be managed.

(FM-8391) Update README per team practices

This commit updates the readme to remove the language marking litmus
as an experimental tool as well as clarifying the instructions for
running acceptance tests and noting the schedule for the IA Content
office hours.

(maint) minor fix for sles

Release version 5.2.0

(FM-8634) ensure encrypted communication for fixtures

(PDK-1501) Fix acceptance stages in Travis CI

Previously the Travis CI file was brought under PDK control, however the
sync.yml did not contain the stage settings for the Litmus jobs which meant
that they did not run.  This commit fixes that error and runs PDK Update again

FM-8499 - remove ubuntu14 support

move unless into manage_security_corerules

(FM-8721) fix php version on redhat8

(FM-8672) - Addition of Support for CentOS 8

Change mod_proxy's ProxyTimeout to follow Apache's global timeout by default

Remove double-colons before apache parameter

Updating proxy per suggestions in puppetlabs#1975

(maint) sort and canonicalise .sync.yml

(maint) mark .gitlab-ci.yml as deleted

(maint) remove obsolete gepetto .project files

(maint) update gitignore and pdkignore for .project file removal

(maint) enable simplecov for ruby codecoverage testing

(maint) Update to PDK 1.14.1

When using mod jk, we expect the libapache2-mod-jk package to be
installed

Add an apache::vhost::fragment define

The apache::vhost::fragment define allows adding fragments to an
existing vhost. This is easier than using the custom_fragment property,
especially when one class defines the vhost and another class wants to
add add some content to that.

MODULES-10242 Add ubuntu14 support back to the modules

MODULES-10236 disable deploy_to_forge for the module

Add Github Actions release workflow

Fix newline being added before proxy params

When a proxy_pass with additional params is defined within a location
block, the params were appended in a new line.

(maint) Remove MAINTAINERS file
Release version 5.3.0

(maint) update travis to not use bundle update --system

(maint) update travis to notify puppet slack

Add mod_auth_openidc to the supported modules

Add template variables and parameters for ModSecurity Audit Logs

SSLProxyEngine on has to be set before any Proxydirective using it

Set ssl_protocol defaults to 'all' only on RHEL8 rather than all supported platforms.

Update default value for ssl_protocol param in REFERENCE docs.

Check osfamily and version >= 8 to cover CentOS and any newer versions.

Added different behavior for @osfamily == 'RedHat'

The icon suffix '-20x22' is removed when @osfamily == 'RedHat' is true.
This way icon paths are correct on RedHat systems and remain unchanged for other OSes.
Updated comment
(FM-8581) - Debian 10 added to travis and provision file refactored

Switch away from using deprecated facts in ssl_protocol params addition.

(MODULES-10391) Fix/Add tests for checking default values of ssl_protocol on os.

Release version 5.4.0

Moved and simplified logic
Less if-statements, better readability
Fixed var
Fixed scope
Namespace issues
Fix proxy_html Module to work on Debian 10

Add acceptance test for auth_oidc with settings

Skip acceptance test for Ubuntu 14.04

Co-Authored-By: Michael T Lombardi (He/Him) <[email protected]>

Fix ubuntu version as float

Co-Authored-By: Michael T Lombardi (He/Him) <[email protected]>
Add ErrorLogFormat directive into virtual host level

Fix pdk validate (rubocop) warnings

Added acceptance test

Rename host (run on clean env?)

Remove acceptance test

Add new directives on virtual host level

   Added deirectives LimitRequestBody, LimitRequestFields, LimitRequestFieldSize
   and LimitRequestLine

Corrected PDK issues (rubocop errors)

Typo in oidcsettings.pp
Use ldap_trusted_mode in conditional

Remove quotes in oidcsettings regex patterns

(IAC-365) updating tokens and dataset for honeycomb

(IAC-215) - Implement use_litmus:true

(IAC-215) - Pdk Update

Add weekly workflow on default branch

Fix php_spec tests for CentOS-8

Update weekly workflow schedule

adding SetInputFilter 

needed to treat incoming gzip objects
add SetInputFilter to vhost template
Update travis to remove livelock

(maint) - Pdk Update

adding inputfilter to vhost_spec
Re-add package for fcgid on debian/ubuntu machines

I'm not sure why this was ever removed. See puppetlabs#1932 

* https://packages.debian.org/buster/libapache2-mod-fcgid
* https://packages.ubuntu.com/eoan/libapache2-mod-fcgid
(IAC-555) - Remove distelli-manifest.yml

(MAINT) Update docker image names

Prior to this commit the provision file referenced the old
waffleimage repo for CI docker images to use. This commit
updates the file to point at litmusimage, which is the repo
the latest images are released to.

(maint) Lock facter version < 4
Revert "(maint) Lock facter version < 4"
daveseff pushed a commit to daveseff/puppetlabs-apache that referenced this pull request Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants