#72 Proxies: decommission dead taskotron and qa stuff
Merged 3 years ago by tflink. Opened 3 years ago by tflink.
Unknown source cleanup-qa-proxy-entries  into  master

@@ -822,3 +822,29 @@

      target: https://docs.fedoraproject.org/en-US/fedora-coreos/faq/

      tags:

      - coreos.fedoraproject.org

+ 

+   # redirects for Taskotron decomissioning

+   - role: httpd/redirect

+     shortname: taskotron-landing

+     website: taskotron.fedoraproject.org

+     path: /

+     target: https://fedoraproject.org/wiki/Taskotron

+ 

+   - role: httpd/redirect

+     shortname: taskotron-execdb

+     website: taskotron.fedoraproject.org

+     path: /execdb/

+     target: https://fedoraproject.org/wiki/Taskotron

+ 

+   - role: httpd/redirect

+     shortname: taskotron-buildmaster

+     website: taskotron.fedoraproject.org

+     path: /taskmaster/

+     target: https://fedoraproject.org/wiki/Taskotron

+ 

+   # redirects for qa.fp.o

+   - role: httpd/redirect

+     shortname: qa

+     website: qa.fedoraproject.org

+     path: /

+     target: https://fedoraproject.org/wiki/QA

@@ -446,23 +446,7 @@

      # Talk directly to the app server, not haproxy

      proxyurl: http://log01

  

-   ### Six entries for taskotron for production

-   - role: httpd/reverseproxy

-     website: taskotron.fedoraproject.org

-     destname: taskotron

-     balancer_name: taskotron

-     balancer_members: ['taskotron01.vpn.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

- 

-   - role: httpd/reverseproxy

-     website: taskotron.fedoraproject.org

-     destname: taskotron-websockets

-     localpath: /taskmaster/ws

-     remotepath: /taskmaster/ws

-     balancer_name: taskotron

-     balancer_members: ['taskotron01.vpn.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

- 

+   ### entries for resultsdb and resultsdb_frontend

    - role: httpd/reverseproxy

      website: taskotron.fedoraproject.org

      destname: taskotron-resultsdb
@@ -481,43 +465,7 @@

      balancer_members: ['resultsdb01.vpn.fedoraproject.org:80']

      http_not_https_yes_this_is_insecure_and_i_feel_bad: true

  

-   - role: httpd/reverseproxy

-     website: taskotron.fedoraproject.org

-     destname: taskotron-execdb

-     localpath: /execdb

-     remotepath: /execdb

-     balancer_name: resultsdb

-     balancer_members: ['resultsdb01.vpn.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

- 

-   - role: httpd/reverseproxy

-     website: taskotron.fedoraproject.org

-     destname: taskotron-vault

-     localpath: /vault

-     remotepath: /vault

-     balancer_name: resultsdb

-     balancer_members: ['resultsdb01.vpn.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

- 

-   ### And four entries for taskotron for staging

-   - role: httpd/reverseproxy

-     website: taskotron.stg.fedoraproject.org

-     destname: taskotron

-     balancer_name: taskotron-stg

-     balancer_members: ['taskotron-stg01.qa.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

-     when: env == "staging"

- 

-   - role: httpd/reverseproxy

-     website: taskotron.stg.fedoraproject.org

-     destname: taskotron-websockets

-     localpath: /taskmaster/ws

-     remotepath: /taskmaster/ws

-     balancer_name: taskotron-stg

-     balancer_members: ['taskotron-stg01.qa.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

-     when: env == "staging"

- 

+   ### staging entries for resultsdb and resultsdb_frontend

    - role: httpd/reverseproxy

      website: taskotron.stg.fedoraproject.org

      destname: taskotron-resultsdb
@@ -538,63 +486,6 @@

      http_not_https_yes_this_is_insecure_and_i_feel_bad: true

      when: env == "staging"

  

-   - role: httpd/reverseproxy

-     website: taskotron.stg.fedoraproject.org

-     destname: taskotron-execdb

-     localpath: /execdb

-     remotepath: /execdb

-     balancer_name: resultsdb-stg

-     balancer_members: ['resultsdb-stg01.qa.fedoraproject.org:80']

-     http_not_https_yes_this_is_insecure_and_i_feel_bad: true

-     when: env == "staging"

- 

-   ### Beaker production

-   - role: httpd/reverseproxy

-     website: beaker.qa.fedoraproject.org

-     destname: beaker

-     # Talk directly to the app server, not haproxy

-     proxyurl: http://beaker01.vpn.fedoraproject.org

-     when: env == "production"

- 

-   ### Beaker staging

-   - role: httpd/reverseproxy

-     website: beaker.stg.fedoraproject.org

-     destname: beaker-stg

-     # Talk directly to the app server, not haproxy

-     proxyurl: http://beaker-stg01.qa.fedoraproject.org

-     when: env == "staging"

- 

-   ### QA staging

- 

-   - role: httpd/reverseproxy

-     website: qa.stg.fedoraproject.org

-     destname: blockerbugs

-     remotepath: /blockerbugs

-     localpath: /blockerbugs

-     proxyurl: "{{ varnish_url }}"

-     when: env == "staging"

- 

-   ### QA production

- 

-   - role: httpd/reverseproxy

-     website: qa.fedoraproject.org

-     destname: qa-prod

-     # Talk directly to the app server, not haproxy

-     proxyurl: http://qa-prod01.vpn.fedoraproject.org

- 

-   - role: httpd/reverseproxy

-     website: phab.qa.fedoraproject.org

-     destname: qa-prod-phab

-     # Talk directly to the app server, not haproxy

-     proxyurl: http://phab.qa-prod01.vpn.fedoraproject.org

-     keephost: true

- 

-   - role: httpd/reverseproxy

-     website: docs.qa.fedoraproject.org

-     destname: qa-prod-docs

-     # Talk directly to the app server, not haproxy

-     proxyurl: http://docs.qa-prod01.vpn.fedoraproject.org

- 

    # This one gets its own role (instead of httpd/reverseproxy) so that it can

    # copy in some silly static resources (globe.png, index.html)

    - role: geoip-city-wsgi/proxy

This removes proxy bits for all the non-resultsdb taskotron bits that
have been removed and old qa stuff that has been decommissioned

Build failed.

1 new commit added

  • proxies: fixing formatting mistake
3 years ago

Build failed.

1 new commit added

  • proxies: second attempt at fixing ansible-review
3 years ago

Build succeeded.

This looks fine to me, but I don't know enough about our proxies config to feel confident about merging this myself.

rebased onto 1c6e441

3 years ago

rebased onto 1c6e441

3 years ago

Pull-Request has been merged by tflink

3 years ago

Build succeeded.