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

534 update config options docs #833

Merged
merged 19 commits into from Apr 30, 2013
Merged

534 update config options docs #833

merged 19 commits into from Apr 30, 2013

Conversation

amercader
Copy link
Member

Based on #693, see previous discussion there.

@vitorbaptista I've created the PR because I could not push more changes to yours becasue it was based on your repo.

@seanh All looks good, I've cleaned up some options and rearranged the sections more logically. Perhaps the most controversial change is moving the authorization config options to the configuration docs and include them back on the authorizations page to avoid duplication (see 01cd2de for details). I'll try it on RTD to make sure it works

These ones are no longer used and will just confuse:

* package_form
* carrot_messaging_library
* amqp_hostname & amqp_port & amqp_user_id & amqp_password
* ckan.log_dir
* ckan.dump_dir
* ckan.backup_dir

Also some minor formatting fixes.
Sections rearranged by importance/usage and items put to their relevant
one.
Sections are now:

 *General Settings
 * Database Settings
 * Site Settings
 * Search Settings
 * Plugin Settings
 * Front-End Settings
 * Theming Settings
 * Activity Streams Settings
 * Feeds Settings
 * Internationalisation Settings
 * Storage Settings
 * Form Settings
 * E-mail Settings
They are one of the most important ones and they should be found on the
conguration options docs. To avoid duplicating them the include rst
directive is used:

.. include:: /configuration.rst
   :start-after: start_config-authorization
   :end-before: end_config-authorization

This requires setting the two markers on the imported file, eg:

.. start_config-authorization

    ... stuff to include ...

.. end_config-authorization
@amercader
Copy link
Member Author

@vitorbaptista
Copy link
Contributor

Cool! Didn't know you could include pages like that 👍

Sean Hammond added 4 commits April 27, 2013 17:08
Make the reST label for cross-referencing each config setting the same
as the name of the config setitng itself, e.g.
ckan.activity_streams_email_notifications, don't mix and match different
styles of ., _ and - like ckan-activity-streams-email-notifications,
ckan_activity_streams_email_notifications, etc.
Now we can easily cross-reference any config option from any file in
docs/.
Use the default ini file locations; Clarify what the [app:main] section
is; say "restart webserver" not Apache, webserver may not be Apache.
@seanh
Copy link
Contributor

seanh commented Apr 27, 2013

The include thing is a great trick. Unfortunately now that I've added labels to each of the ckan.auth.* settings, we're getting Sphinx warnings about them because the labels are being included twice :( This may break cross-referencing to these config options. Never mind for now, we can try to find some way around this later.

I've changed the labels for the config settings to be the same as the names of the config options, e.g. ckan.activity_streams_email_notifications not ckan-activity-streams-email-notifications or ckan_activity_streams_email_notifications or config_activity-streams or anything else. This just makes cross-referencing easier cause you don't need to check configuration.rst to see what the label is. I also added labels to every config option, for the same reason.

I edited the text at the top of the page.

I used Sphinx's .. deprecated:: directive to mark config options as deprecated.

I'm not sure about breaking the config options up into different sections like Site Settings, Frontend Settings, etc. This may just make it harder because now you have to decide what section an option belongs in. For example, does ckan.site_title go in Frontend Settings or Site Settings?

Also, some settings actually use the setting names to namespace themselves, e.g. ckan.auth.*, ckan.preview.*. If there's going to be any breaking up the docs into sections, the sections should probably follow this namespacing strictly, instead of inventing their own conflicting sections.

I think we can probably just sort all the config options alphabetically, and then we won't need sections, because all the ckan.auth.* ones will naturally follow each other, etc.

I'll leave the sections in for now, though.

@seanh
Copy link
Contributor

seanh commented Apr 27, 2013

@vitorbaptista Are there any more options that should be documented, deleted from the code, or marked deprecated in the code? See #534 and #693. Once you're satisfied that we've got them all, we can merge this.

@vitorbaptista
Copy link
Contributor

@seanh As far as I can see, considering that we won't document legacy configuration options as discussed in #534, we're done. I've created #842 for ckan.extra_resource_group_fields and documented ckan.template_title_deliminater.

@seanh
Copy link
Contributor

seanh commented Apr 29, 2013

@vitorbaptista Are you sure that extra_template_paths and extra_public_paths are legacy? I think these are still used

Sean Hammond added 6 commits April 29, 2013 17:21
This is used by much more than just the API
Fix typos, and mark the feature as experimental
It's a list of plugins, not a list of extensions
@amercader
Copy link
Member Author

I'm not sure about breaking the config options up into different sections like Site Settings, Frontend Settings, etc. This may just make it harder because now you have to decide what section an option belongs in. For example, does ckan.site_title go in Frontend Settings or Site Settings?

I personally find the sections useful, as the options are not properly namespaced and the list is a bit daunting without them. Also you are likely to want to know about options related to the same thing.

@amercader
Copy link
Member Author

I just noticed that there are lots of undocumented filestore options present in the deployment.ini_tmpl file and not in the configuration option docs:

https://github.com/okfn/ckan/blob/master/ckan/config/deployment.ini_tmpl#L245
https://github.com/okfn/ckan/blob/master/doc/filestore.rst

@seanh
Copy link
Contributor

seanh commented Apr 29, 2013

Yeah let's keep the sections for now

@seanh
Copy link
Contributor

seanh commented Apr 29, 2013

That's a bit worrying about those filestore settings. How did we miss those? The code accesses them with config['...'] so we should have found them...

@ghost ghost assigned seanh Apr 30, 2013
@seanh seanh merged commit 31a0c22 into master Apr 30, 2013
@seanh
Copy link
Contributor

seanh commented Apr 30, 2013

I've merged this into master and 2.0 and made a new issue to keep working on this for 2.1: #848

@vitorbaptista vitorbaptista deleted the 534-update-config-options-docs branch May 3, 2013 01:08
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.

None yet

3 participants