Opened 5 years ago

Closed 5 years ago

#2301 closed change (fixed)

Improve beta.adblockplus.org configuration

Reported by: trev Assignee: trev
Priority: P3 Milestone:
Module: Infrastructure Keywords:
Cc: matze Blocked By:
Blocking: #2035 Platform: Unknown
Ready: yes Confidential: no
Tester: Verified working: no
Review URL(s):

http://codereview.adblockplus.org/4808447505727488/
http://codereview.adblockplus.org/5649911861215232/
http://codereview.adblockplus.org/6608332739575808/

Description

Background

beta.adblockplus.org has been set up as a minimal web server right now. However, our current website has lots of additional functionality.

What to change

Add custom nginx configuration for UA detection, CSP headers, devbuilds redirects etc. Set up multiplexer locations currently available via adblockplus.org. Proxy access to URLs like /blog or /forum.

Change History (7)

comment:1 Changed 5 years ago by trev

The new configuration is significantly different from the old one, that's unavoidable given the completely different setups. So I decided to remove a bunch of ancient redirects:

      rewrite ^/en/nsIAdblock(.*) /en/IAdblock$1 permanent;
      rewrite ^/(\w\w(_\w\w)?)/installation$ /$1/ permanent;
      rewrite ^/anwiki/(.*) /$1 permanent;

      if ($query_string ~ "tip=disable") {
        rewrite ^/(\w\w)/tips$ /$1/faq_basics#disable? permanent;
      }
      if ($query_string ~ "tip=effective_filter") {
        rewrite ^/(\w\w)/tips$ /$1/getting_started#false-positives? permanent;
      }
      if ($query_string ~ "tip=subscriptions_remove_filter") {
        rewrite ^/(\w\w)/tips$ /$1/getting_started#false-positives? permanent;
      }
      rewrite ^/(\w\w)/tips$ /$1/getting_started? permanent;

      if ($arg_category = "mozilla/gecko/security")
      {
        rewrite ^/(atom|rss)/$ /$1/?category=mozilla,gecko,security? permanent;
      }
      if ($arg_category = "mozilla%2Fgecko%2Fsecurity")
      {
        rewrite ^/(atom|rss)/$ /$1/?category=mozilla,gecko,security? permanent;
      }

      location /awstats/ {
        rewrite ^ https://stats.adblockplus.org/web/adblockplus.org/;
      }

These refer to URLs that existed at least three years ago.

Last edited 5 years ago by trev (previous) (diff)

comment:2 Changed 5 years ago by trev

There were also some redirector entries referring to pages that have been removed:

        if ($arg_link ~ "^knownIssues_(\w+)")
        {
          set $link "known-issues";
          set $anchor "#$1";
        }
        if ($arg_link ~ "^knownIssuesChrome_(\w+)")
        {
          set $link "known-issues-chrome";
          set $anchor "#$1";
        }

These are not part of the new config either.

comment:3 Changed 5 years ago by trev

  • Review URL(s) modified (diff)
  • Status changed from new to reviewing

comment:4 Changed 5 years ago by trev

  • Owner set to trev

comment:5 Changed 5 years ago by trev

  • Review URL(s) modified (diff)

Pushed https://hg.adblockplus.org/infrastructure/rev/49377f583088 but realized that this commit had issues. Follow-up patch under review, the changes have already been deployed to the server.

comment:6 Changed 5 years ago by trev

  • Review URL(s) modified (diff)

comment:7 Changed 5 years ago by trev

  • Resolution set to fixed
  • Status changed from reviewing to closed

Fixed links in forum and blog as well: https://hg.adblockplus.org/infrastructure/rev/cee777eae620

Note: See TracTickets for help on using tickets.