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: add support for additional nginx configuration #834

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

steled
Copy link

@steled steled commented Dec 20, 2024

What this PR does / why we need it

It would be great to be able to configure nginx via additional config files from the /var/config/nginx/conf.d directory.

Issue

Test Result

Additional documentation or context

Summary by CodeRabbit

  • New Features

    • Enhanced configuration management by allowing dynamic inclusion of multiple configuration files in Nginx.
  • Bug Fixes

    • No specific bug fixes were noted in this release.

Copy link

coderabbitai bot commented Dec 20, 2024

Walkthrough

The Nginx configuration template has been updated to include a new directive within the server block. The line include /var/config/nginx/conf.d/*.conf; allows for the inclusion of all configuration files from a specified directory, enhancing the modularity of the Nginx configuration. Existing settings related to gzip, proxy configurations, and location directives remain unchanged.

Changes

File Change Summary
nginx.conf.template Added include /var/config/nginx/conf.d/*.conf; directive in the server block to dynamically include additional configuration files

Poem

🐰 A Rabbit's Nginx Ode
In configs deep, a new path springs,
Modular magic, what joy it brings!
Conf files dance in their new home,
Nginx now flexes, free to roam 🌈
A template's whisker, subtly changed


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 8169228 and c46e68d.

📒 Files selected for processing (1)
  • nginx.conf.template (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • nginx.conf.template

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (2)
nginx.conf.template (2)

48-49: Document the additional configuration capability

This change introduces important new functionality that should be documented.

Consider adding a comment above the include directive explaining:

+        # Include additional nginx configurations
+        # Place custom .conf files in /var/config/nginx/conf.d/
         include /var/config/nginx/conf.d/*.conf;

Also, please ensure this feature is documented in:

  1. README.md
  2. Deployment guide
  3. Configuration guide

48-49: Consider impact of configuration order

The include directive is placed after all other location blocks, which means included configurations can potentially override existing settings. While this might be intentional, it should be clearly documented to prevent unexpected behavior.

Consider:

  1. Adding a warning comment about override potential
  2. Documenting any restrictions on what can be included
  3. Implementing validation for included configurations if possible
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 30274e8 and 8169228.

📒 Files selected for processing (1)
  • nginx.conf.template (1 hunks)
🔇 Additional comments (1)
nginx.conf.template (1)

48-49: Verify directory existence and permissions

The include directive for additional configurations is correctly placed and follows nginx best practices. However, there are some operational considerations to address:

  1. Ensure the /var/config/nginx/conf.d directory:

    • Exists when the container starts
    • Has appropriate read permissions for the nginx user
    • Is properly documented in the deployment guide
  2. Consider the startup behavior when no .conf files exist

Let's verify the container setup:

✅ Verification successful

Nginx configuration directory setup is properly handled

The configuration is secure and follows best practices:

  • /var/config directory is created with proper ownership (nginx user 499)
  • /var/config/nginx directory is created at runtime before nginx starts
  • All nginx configurations are copied from /etc/nginx to /var/config/nginx
  • The process runs as the nginx user (499) for security

The include directive will work correctly as:

  1. The directory structure is properly created
  2. The nginx user has the necessary permissions
  3. Even if no additional .conf files exist, nginx will start normally
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if the Dockerfile or deployment manifests handle the config directory

# Check for directory creation in Dockerfile
rg -l "mkdir.*(/var/config/nginx/conf\.d|/var/config/nginx)" 

# Check for volume mounts or config maps in k8s manifests
fd -e yaml -e yml | xargs rg "/var/config/nginx/conf\.d"

Length of output: 201


Script:

#!/bin/bash
# Let's check the Dockerfile to see how the directory is created and its permissions
cat Dockerfile | grep -A 5 -B 5 "mkdir.*var/config/nginx"

Length of output: 519

- added suport for additional configuration files via /var/config/nginx/conf.d directory

Signed-off-by: Stephan <[email protected]>
@houhoucoop
Copy link
Contributor

I’m thinking of closing this PR since we might not need it, any ideas?

@steled
Copy link
Author

steled commented Dec 25, 2024

I thought it would bei good to have this possibility as I'm using cilium ingress and currently it is not possible to configure it with annotations so I need to configure them directly in the apps.

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

Successfully merging this pull request may close these issues.

2 participants