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

Web config docs 11723 11724 #584

Merged
merged 8 commits into from Dec 17, 2013

Conversation

manics
Copy link
Member

@manics manics commented Dec 11, 2013


::

$ bin/omero config set omero.web.force_script_name '/testing'
Copy link
Member

Choose a reason for hiding this comment

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

These boxes look different from the ones under Debug mode. Perhaps differing whitespace?

@joshmoore
Copy link
Member

Other than the whitespace issue, this looks good. If it's easy, having "Apache" and "Nginx" show up in the menu on the right might be useful for users but may also be too much.

@manics
Copy link
Member Author

manics commented Dec 16, 2013

@joshmoore How about this? I've moved Start the Django FastCGI workers to before the configs otherwise it'll appear under nginx.

@joshmoore
Copy link
Member

Makes sense. A few things:

  • might be able to do without the "apache" / "nginx" line; could it be confusing?
  • new boxes under Apache and Nginx... still have the weird CSS purpleness.
  • the separation of command (bin/omero web config apache) and text is slightly hard to discern and may possible make it harder for others to copy-n-paste. If we have an alternative command markup, might be worth it. Otherwise, probably ok for now. /cc @hflynn


Apache configuration
""""""""""""""""""""
::
Copy link
Member

Choose a reason for hiding this comment

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

If you remove the indenting before the :: and make the the following text only indented by 4 spaces, that will get rid of the blue/purple highlighting on the webpage.

@manics
Copy link
Member Author

manics commented Dec 17, 2013

How about this? http://users.openmicroscopy.org.uk/~spli/tmp/omero/_build/html/sysadmins/unix/install-web.html
Note the purple highlighting would only show up on the proper build

@hflynn
Copy link
Member

hflynn commented Dec 17, 2013

That should be fine formatting-wise (am rebuilding staging to check but looks good to me). You happy with this now @joshmoore ?

@hflynn
Copy link
Member

hflynn commented Dec 17, 2013

Yep, formatting fixed, thanks.

@joshmoore
Copy link
Member

I'm happy (and quiet now). Go for it.

(For some other time, there's another command with the "a" / "b" syntax which might should be addressed)

hflynn added a commit that referenced this pull request Dec 17, 2013
@hflynn hflynn merged commit d7caafe into ome:develop Dec 17, 2013
@manics
Copy link
Member Author

manics commented Dec 18, 2013

--rebased-to #595

@manics manics deleted the web_config_docs-11723-11724 branch January 27, 2014 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants