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 CADDY_EXTRA_DIRECTIVES #660

Merged
merged 5 commits into from
Jul 21, 2022

Conversation

blackheaven
Copy link
Contributor

No description provided.

@CLAassistant
Copy link

CLAassistant commented Jul 5, 2022

CLA assistant check
All committers have signed the CLA.

Copy link
Owner

@dunglas dunglas left a comment

Choose a reason for hiding this comment

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

Good idea. Maybe just EXTRA_DIRECTIVES for consistency with GLOBAL_OPTIONS which doesn't include the CADDY prefix?

valueFrom:
configMapKeyRef:
name: {{ include "mercure.fullname" . }}
key: extra-directives
Copy link
Owner

Choose a reason for hiding this comment

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

The config template must be updated as well isn't it? We also need a new value.

Also, I would use a secret as this env var may contains secret keys and things like this, depending on the modules you use.

WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did it, but it may be confusing with extra-directives/extraDirectives, should I change it too?

@blackheaven
Copy link
Contributor Author

Actually, it works on my computer, can you have a look please?

@dunglas
Copy link
Owner

dunglas commented Jul 21, 2022

I'm not sure of what the issue is, but the error in the CI is wget: bad address 'mercure-jg4qdqb8ei:80'.

@dunglas dunglas merged commit 3372972 into dunglas:main Jul 21, 2022
@dunglas
Copy link
Owner

dunglas commented Jul 21, 2022

Thanks!

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.

3 participants