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

Add extra licensing, minutes & support -> docs redirects #56

Merged
merged 15 commits into from
Apr 6, 2018

Conversation

hflynn
Copy link
Contributor

@hflynn hflynn commented Apr 4, 2018

When testing the redirect for https://trello.com/c/riJnvMrD/147-downloads-page-cc-license-link I noticed the link behind the "GNU General public license" text was a different construction and only redirecting to the top level About page so this adds that as a redirect to the licensing page too.

@hflynn hflynn changed the title Add extra licensing redirect from downloads footer Add extra licensing & support -> docs redirects Apr 5, 2018
@hflynn hflynn changed the title Add extra licensing & support -> docs redirects Add extra licensing, minutes & support -> docs redirects Apr 5, 2018
@hflynn
Copy link
Contributor Author

hflynn commented Apr 5, 2018

I realize I could also redirect more of the minutes/meetings/ URLs now the older user meetings are live but I'll do that on a follow up PR along with the other items we've identified rather than add even more here.

@sbesson
Copy link
Member

sbesson commented Apr 5, 2018

Deployed on ome-www-dev. The licensing and minutes redirect seems to work but not the support redirects. I will take a look at it tomorrow.

Copy link
Member

@sbesson sbesson left a comment

Choose a reason for hiding this comment

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

@hflynn
Copy link
Contributor Author

hflynn commented Apr 6, 2018

Sorry @sbesson I don't know why this is failing travis - the error message is about nginx and doesn't look related to my changes

- match: "~/site/support/bio-formats/(?<link>.*[^/])/?$"
dest: https://docs.openmicroscopy.org/latest/bio-formats/$link/
- match: "~/site/support/bio-formats(?<link>/.*)?$"
dest: https://docs.openmicroscopy.org/latest/bio-formats$link;
Copy link
Member

Choose a reason for hiding this comment

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

Sorry the trailing ; (copied pasted from #56 (review)) needs to be removed as it prevents nginx from starting

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, I thought they were a bit random, should have checked with you!

@hflynn
Copy link
Contributor Author

hflynn commented Apr 6, 2018

@sbesson passing travis now at least!

@sbesson sbesson merged commit 15e9f13 into ome:master Apr 6, 2018
@sbesson
Copy link
Member

sbesson commented Apr 6, 2018

Deployed live on www.openmicroscopy.org

(ansible) sbesson@ls30630:prod (master) $ pytest playbooks/www/tests/check_redirects.py 
===================================================================================== test session starts =====================================================================================
platform darwin -- Python 2.7.14, pytest-3.4.1, py-1.5.2, pluggy-0.6.0
rootdir: /private/tmp/management_tools/prod, inifile:
plugins: testinfra-1.5.5, pyfakefs-3.3
collected 362 items                                                                                                                                                                           

playbooks/www/tests/check_redirects.py ................................................................................................................................................ [ 39%]
....................................................................................................................................................................................... [ 90%]
...................................                                                                                                                                                     [100%]

================================================================================= 362 passed in 61.73 seconds =================================================================================

manics pushed a commit to manics/prod-playbooks that referenced this pull request Jun 13, 2018
Add extra licensing, minutes & support -> docs redirects
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.

2 participants