-
-
Notifications
You must be signed in to change notification settings - Fork 506
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
DietPi-Software | Simplify and consistent config file naming #2312
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Fourdee
Ah the idea was to just use conf
here for config files?
Shall we then do this for other software titles as well?
Only concern I have is, if e.g. we remove a software title from DietPi and replace the ID, the old dietpi-software versions will not recognize and place a wrong config file.
If those have a more specific name, then at least the user will face a meaningful error, can upgrade, ask or inform himself about dropped software.
@Fourdee |
Damn... /etc/nginx/conf.d is main config level while /etc/nginx/sites-dietpi was server config level (included by sites-enabled/default).
|
Should not matter, as master branch will not change until we PR. Just need to make sure we update |
Ignore it for now, testing/getting it ready only. |
echo '# Redirect Cal/CardDAV requests to ownCloud endpoint: | ||
location = /.well-known/carddav { | ||
return 301 $scheme://$host/owncloud/remote.php/dav; | ||
} | ||
location = /.well-known/caldav { | ||
return 301 $scheme://$host/owncloud/remote.php/dav; | ||
}' > /etc/nginx/sites-dietpi/dietpi-dav_redirect.config | ||
}' > /etc/nginx/sites-dietpi/dietpi-dav_redirect.conf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs verifying if Nginx supports the .conf
extension. Might require .config
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See it passed local testing, will merge and test also:
https://github.com/Fourdee/DietPi/issues/2308#issuecomment-443547842
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Fourdee
Jep file ending can be freely chosen by include directive. Also inside conf.d it is .conf, similar to all other webservers. So it's more constant to stay with this.
Thanks Micha, looks good, will merge 👍 |
Status: Ready
Commit list/description:
... all of them 😄