-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
(MODULES-9104) Add file_mode to config files. #1922
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- ::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.
Thanks a lot for your contribution @stevegarn .Some of the ad-hoc jobs are failing. Could you please rebase your changes with the master. Since there are changes on metadata.json to use the latest version of dependent modules. |
rebase from main project
daveseff
pushed a commit
to daveseff/puppetlabs-apache
that referenced
this pull request
Jun 13, 2019
- ::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.
daveseff
pushed a commit
to daveseff/puppetlabs-apache
that referenced
this pull request
Jun 13, 2019
- ::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.
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"
cegeka-jenkins
pushed a commit
to cegeka/puppet-apache
that referenced
this pull request
Jul 15, 2020
- ::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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
::apache::file_mode
attribute is missing from several config files, including the main config file in::apache
, any custom config files managed byapache::custom_config
, and reqtimeout.conf managed byapache::mod::reqtimeout
mode => $::apache::file_mode
to::apache
,apache::custom_config
, andapache::mod::reqtimeout
to correct the inability to manage the mode of these config files.