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

Configure DirectoryIndex by default #854

Merged
merged 1 commit into from
Dec 6, 2022

Conversation

teluq-pbrideau
Copy link
Contributor

Pull Request (PR) description

Make sure the DirectoryIndex is configured when apache 'default_mods` are disabled:

  class { 'apache':
    default_mods  => false,
  }

  class { 'zabbix' :
    [...]
  }

Feel free to correct me if you think it should not be in this module, but instead only in my own profile.

This Pull Request (PR) fixes the following issues

Fixes #853

@smortex
Copy link
Member

smortex commented Nov 29, 2022

If the module is required, then it make sense to include it 👍.

There seems to be some style issues in this file, do you mind adding a commit to fix those?

@teluq-pbrideau
Copy link
Contributor Author

the problems aren’t related to my changes, but here is the linter fixed
I expect the other tests to fail, I fixed the problem in #850 , do you recomment me to merge the changes to this PR, or to wait for it to be merged in master?

@smortex
Copy link
Member

smortex commented Nov 29, 2022

Ah, thanks for the pointer! The other PR looked good, I merged it.

Can you please rebase your changes on top of the main branch (the second commit being already in master it should be removed in the process)?

From your working directory:

git fetch origin       # Download the latest code we have here
git rebase origin/master # Move your commits on top of the main branch
git push -f            # Send the changes (-f is required because we re-wrote history)

@teluq-pbrideau
Copy link
Contributor Author

well, the archlinux build seems broken:

archlinuxrolling-64.example.com 14:26:51$ puppet module install puppetlabs-postgresql -v 7.5.0
  Could not find 'english' (>= 0.a) among 97 total gem(s)
  Checked in 'GEM_PATH=/root/.local/share/gem/ruby/3.0.0:/usr/lib/ruby/gems/3.0.0' , execute `gem env` for more information

@teluq-pbrideau
Copy link
Contributor Author

Error: The template Linux SNMP does not exist in Zabbix. Please use a correct one.

It appears upstream has renamed the snmp templates:
Linux SNMP -> Linux by SNMP

It should probably be fixed in its own PR

@smortex
Copy link
Member

smortex commented Nov 30, 2022

It should probably be fixed in its own PR

Fine. You can create the feature branch on top of this branch if it helps you with testing, just remind us that "This PR also include # " in the new PR.

The CI failure put aside, this LGTM!

@smortex smortex added the bug Something isn't working label Nov 30, 2022
@smortex
Copy link
Member

smortex commented Dec 6, 2022

#855 has been merged, which should fix CI. The change is unlikely to have any impact regarding CI so let's merge this, thanks!

@smortex smortex merged commit 0c4bd78 into voxpupuli:master Dec 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Set DirectoryIndex in the zabbix module
2 participants