Skip to content
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

(feat) - Make compatible with Amazon Linux 2 #1845

Closed
wants to merge 65 commits into from

Conversation

engshine
Copy link

No description provided.

juju4 and others added 26 commits January 13, 2018 12:49
You can pass

```puppet
comment => 'My comment',
```

or
```puppet
comment => [
  'comment 1',
  'comment 2',
],
```

Each element from the array will be added as a separate line.
…vhost

Add option to add comments to the header of a vhost file
fix apache::mod::jk example typo and add link for more info
MODULES-7379: Fixing syntax by adding newline
…rity_in_readme

Fix default vhost priority in readme
…ads/master-0-gabccfb1

pdksync - pdksync_heads/master-0-gabccfb1
…n9_itk

ensure mpm_event is disabled under debian 9 if mpm itk is used
Prior to this commit, a GPG key mismatch prevented the phusion
passenger RPM from installing on RedHat based installs.  This
commit updates the GPGKey to match the one provided by the script
https://packagecloud.io/phusion/passenger/install#bash-rpm.
Updated default params added.
Exclusions added for certain features.
Removed some code for Ubuntu 10.04
(MODULES-8108) - Support added for Debian 9
…d-passenger-gpgkey

(MODULES-8429) Update GPG key for phusion passenger
PR made to finialize work started by community member bastelfreak, (puppetlabs#1809).
Includes work done to migrate spec classes tests to rspec-puppet-facts.

Co-authored-by: Tim Meusel <[email protected]>
(MODULES-8107) - Support added for Ubuntu 18.04.
…apache2.conf' on Debian Family OS of 9/18.04 onwards
(maint) Add Ubuntu 14.04 back to the supported modules list
(MODULES-5990) Addition of 'IncludeOptional conf-enabled/*.conf' to '…
@pmcmaw pmcmaw changed the title Fixes to support Amazon Linux 2 (feat) - Make compatible with Amazon Linux 2 Dec 7, 2018
@pmcmaw
Copy link
Contributor

pmcmaw commented Dec 7, 2018

Hey @engshine

If you can rebase your PR I can work with you on getting this change merged. Please note I have updated the title of your PR. We are happy to merge your changes to make the code compatible with Amazon Linux 2 however this functionality is not something that Puppet will provide support for. Just want to ensure you are ok with this before we start working towards getting this piece of work merged.

Many Thanks
The Modules Team

pmcmaw and others added 20 commits December 18, 2018 17:16
…LES-8379

(Modules 8141/Modules 8379) - Addition of support for SLES 15
pdksync - (FM-7655) Fix rubygems-update for ruby < 2.3
(maint) - Put translation update into master
…ads/master-0-g9c815ea

pdksync - pdksync_heads/master-0-g9c815ea
(MODULES-5990) - conf-enabled defaulted to undef
@david22swan
Copy link
Member

@engshine Is there any movement on this pr??

@engshine
Copy link
Author

@engshine Is there any movement on this pr??

Hi @david22swan (and @pmcmaw), apologies for the delay.
I've rebased from puppetlabs-apache/master.

Cheers

@david22swan
Copy link
Member

@engshine I'm afraid there's a problem with how you have rebased. When we say we rebase we mean the git method of transplanting your changes onto a new location, while what you have done is simply merge the master into your branch.
It's an easy mistake to make and happen's rather often, but it can cause problems when merging it into the code as it pollutes the history of the module and makes it hard to track down changes if problems occur.
I hate to ask this but if you could copy your original changes onto a fresh branch it would be greatly appreciated.

@david22swan
Copy link
Member

@engshine Apologies but is there still movement on this pr??

@david22swan
Copy link
Member

@engshine In order to move thing's along I have retrieved your original commit, rebased it onto the current master, pushed it back up and created a new PR which you can find here:
#1898
As such I will now be closing this PR.
Thank you for the work that you put in and apologies on the time it has taken to get it merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.