-
Notifications
You must be signed in to change notification settings - Fork 324
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
[RFC] docs/site-example: add minimal domain config #1261
Conversation
-- Take a look at the documentation located at | ||
-- http://gluon.readthedocs.org/ for details. | ||
-- | ||
-- This configuration will not work as it. You're required to make |
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.
... will not work as is... there is a typo in there.
How about: This is not a complete working example. You are required to make community-specific changes to it to make it work.
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.
This is copied from the current site.conf example, if there is a typo, we should fix that in the current example and I will update this PR accordingly.
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.
as is
is the correct ending to that sentence. Why not update it in this PR, it's just a typo.
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.
i fixed it in the current example now, so you can change it in your PR, too.
As nodes expose both a |
8cf70ec
to
948ada1
Compare
This will need to be updated with the changes mentioned in #1216 (comment) ; in addition the the example, the list of supported site config options must be extended with information which options are valid in what config files. A more high-level explanation of the multi-domain feature would also be nice. |
@mweinelt I think for single-domain setups, making the site code and domain code equal makes sense. The pretty name of the domain will be displayed on the status page, so it's preferable not to use something like "Default" there. |
allowed in both site and domain config
allowed in site only
allowed in domain only
|
Here is the updated list of allowed places for config options. I'm not sure, how we should add them to the documentation? As a tags "domain config", "site config" per section in the explanation in the "site configuration" page? As the documentation is splitted into sections e.g. |
@lemoer some updates for your list according to current gluon master: allowed in site only: allowed in domain only: |
I would like to rename the example domain from "def"/"Default Domain" to "ffxx"/"Freifunk Alpha Centauri" (make domain code and domain name match site code and site name). As we want to extend the status page with a "domain name" field, it should display a proper domain name and not "Default Domain" even in single-domain setups. Recommending to make the domain match the site makes sense for such setups in my opinion. An alternative would be to allow disabling domain support in site.mk - while I originally liked the idea of always enabling domains to keep the code simple, I'm less convinced now. And as we already merge site and domain whereever we use them, only small parts of the code would need to be adjusted. Opinions? |
Multidomain support is merged now. It is disabled by default and can be enabled by setting GLUON_MULTIDOMAIN=1 in site.mk. |
a little reminder that this is one of the few release blockers |
Thanks for the reminder. I'll try to do this in today's evening. |
Here is my first draft: https://md.darmstadt.ccc.de/gluon-multidomain_doc Please feel free to improve it, since it's very raw for now. |
This PR is superseded by #1365. If anything is missing from that PR, please contribute there or help with the review. |
depends on #1216