diff --git a/docs/develop/update/apache.rst b/docs/develop/update/apache.rst index 17b1facb..56c54b19 100644 --- a/docs/develop/update/apache.rst +++ b/docs/develop/update/apache.rst @@ -50,10 +50,9 @@ Add to your service's Pillar file: ocds-docs-live: configuration: docs servername: standard.open-contracting.org - serveraliases: ['live.standard.open-contracting.org'] + serveraliases: ['myalias.open-contracting.org'] context: - ocds_cove_backend: https://cove.live3.cove.opencontracting.uk0.bigv.io - timeout: 1830 # 30 sec longer than cove's uwsgi.harakiri + mykey: myvalue This will: diff --git a/docs/reference/docs.rst b/docs/reference/docs.rst index b393720a..1fd2dc46 100644 --- a/docs/reference/docs.rst +++ b/docs/reference/docs.rst @@ -6,7 +6,7 @@ This page serves as an orientation to how different components of the OCDS docum Servers ------- -The ``docs`` target serves OCDS documentation (e.g. `1.1 `__), its profiles (e.g. `Public Private Partnerships `__) and draft documentation (below). It is a reverse proxy to the `OCDS Data Review Tool `. It also serves Elasticsearch. +The ``docs`` target serves OCDS documentation (e.g. `1.1 `__), its profiles (e.g. `Public Private Partnerships `__) and draft documentation (below). It also serves Elasticsearch. Version and language switchers ------------------------------ diff --git a/pillar/docs.sls b/pillar/docs.sls index 042a939b..b84cb8ce 100644 --- a/pillar/docs.sls +++ b/pillar/docs.sls @@ -15,9 +15,6 @@ apache: ocds-docs-live: configuration: docs servername: standard.open-contracting.org - context: - ocds_cove_backend: https://cove.live3.cove.opencontracting.uk0.bigv.io - timeout: 1830 # 30 sec longer than cove's uwsgi.harakiri elasticsearch: public_access: True diff --git a/salt/apache/files/docs/robots.txt b/salt/apache/files/docs/robots.txt index 44e0dc60..74228d1c 100644 --- a/salt/apache/files/docs/robots.txt +++ b/salt/apache/files/docs/robots.txt @@ -8,8 +8,6 @@ Disallow: /1.0 Disallow: /legacy # Disallow protected development branches. Disallow: /staging -# Disallow Data Review Tool results. -Disallow: /review/data User-Agent: LinkChecker Allow: / diff --git a/salt/apache/files/sites/docs.conf.include b/salt/apache/files/sites/docs.conf.include index 8698d915..6d27ac0d 100644 --- a/salt/apache/files/sites/docs.conf.include +++ b/salt/apache/files/sites/docs.conf.include @@ -32,7 +32,6 @@ 'versions': ['latest', '1.1', '1.0'], 'languages': ['en', 'es', 'fr'], 'redirect_excludes': ['staging', 'schema', 'profiles', 'legacy', 'favicon.ico', 'robots.txt'], - 'cove_backend': ocds_cove_backend, 'stable_sitemap': [['latest', '1.1', '1.0']], }, } @@ -163,13 +162,6 @@ SetEnv proxy-nokeepalive 1 {% endfor %} {% endfor %} - - {% if 'cove_backend' in opts %} - # Proxy to the Data Review Tool, if configured. /media contains user-submitted content. - ProxyPass {{ root }}/review {{ opts.cove_backend }}{{ root }}/review timeout={{ timeout }} - ProxyPass {{ root }}/static {{ opts.cove_backend }}{{ root }}/static - ProxyPass {{ root }}/media {{ opts.cove_backend }}{{ root }}/media - {% endif %} {% endfor %} #################### @@ -217,9 +209,11 @@ Redirect /profiles/eu/master /profiles/eu/latest Redirect /profiles/gpa/master /profiles/gpa/latest # The Validator was renamed the Data Review Tool. -Redirect /validator /review -RedirectMatch ^/validator/(.*)$ /review/$1 -# The Data Review Tool was moved to its own subdomain. +Redirect /validator https://review.standard.open-contracting.org +RedirectMatch ^/validator/(.*)$ https://review.standard.open-contracting.org/$1 +# The Data Review Tools were moved to their own subdomain. +Redirect /review https://review.standard.open-contracting.org +RedirectMatch ^/review/(.*)$ https://review.standard.open-contracting.org/$1 Redirect /infrastructure/review https://review-oc4ids.standard.open-contracting.org RedirectMatch ^/infrastructure/review/(.*)$ https://review-oc4ids.standard.open-contracting.org/$1