configure www.bb.net

files/www-redirects

@@ -0,0 +1,19 @@
+rewrite ^/trac[)>\]]?(.*)$ http://trac.buildbot.net$1 permanent;
+rewrite ^/buildbot/tutorial(.*)$ http://docs.buildbot.net/current/tutorial$1 permanent;
+rewrite ^/pkgs(.*)$ http://buildbot.buildbot.net/static/pkgs$1 permanent;
+rewrite ^/metabuildbot(.*)$ http://buildbot.buildbot.net$1 permanent;
+rewrite ^/buildbot/coverage(.*)$ http://buildbot.buildbot.net/static/coverage$1 permanent;
+rewrite ^/buildbot/docs/(latest|current)/try.html http://docs.buildbot.net/$1/manual/cmdline.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Configuration.html http://docs.buildbot.net/$1/manual/configuration.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Installation.html http://docs.buildbot.net/$1/manual/installation.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Build-Steps.html http://docs.buildbot.net/$1/cfg-buildsteps.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Schedulers.html http://docs.buildbot.net/$1/manual/cfg-schedulers.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Change-Sources.html http://docs.buildbot.net/$1/manual/cfg-changesources.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Using-ShellCommands.html http://docs.buildbot.net/$1/manual/cfg-buildsteps.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/ShellCommand.html http://docs.buildbot.net/$1/manual/cfg-buildsteps.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/Requirements.html http://docs.buildbot.net/$1/manual/installation.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/System-Architecture.html http://docs.buildbot.net/$1/manual/concepts.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/WithProperties.html http://docs.buildbot.net/$1/manual/cfg-properties.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/release-notes.html http://docs.buildbot.net/$1/relnotes/index.html permanent;
+rewrite ^/buildbot/docs/(latest|current)/release-notes/(.*) http://docs.buildbot.net/$1/relnotes/$2 permanent;
+rewrite ^/buildbot/docs(.*)$ http://docs.buildbot.net$1 permanent;

host-vm1.yml

@@ -5,4 +5,13 @@
   connection: local
   sudo: yes
   roles:
-  - base-servicehost
+  # Restore once jails are moved to service{1,2,3}
+  # - base-servicehost
+  - role: jail
+    name: www
+    hostname: www.buildbot.net
+    ip_address:
+    - 'lagg0|140.211.10.238'
+    - 'vlan0|192.168.80.238'
+
+# vim:ts=2:sw=2:noai:nosi

jail-www.yml

@@ -0,0 +1,44 @@
+---
+- name: configure www
+  hosts: www
+  gather_facts: no
+  connection: local
+  sudo: yes
+  vars:
+    # When it's used in production (buildbot.net points to this host) change to
+    # buildbot.net.
+    web_host_name: www-new.buildbot.net
+    build_dir: site
+
+  roles:
+  - base
+  - role: packages
+    packages:
+    - node
+    - npm
+  - role: user
+    user_id: "{{ worker_account }}"
+    user_name: Buildbot Worker Account
+  - role: simple-buildout
+    repo_url: git://github.com/buildbot/buildbot-website.git
+    repo_branch: master
+    target_user: "{{ worker_account }}"
+    target_dir: "{{ getent_passwd[worker_account].4 }}/{{ build_dir }}"
+    target_commands:
+    - "npm install"
+    - "./node_modules/.bin/grunt prod"
+  - role: nginx
+    nginx_template: static
+    server_name: "{{ web_host_name }}"
+    server_root: "{{ getent_passwd[worker_account].4 }}/{{ build_dir }}/built"
+    extra_config_from: "files/www-redirects"
+  - role: nginx
+    nginx_template: domain-redirect
+    server_name: redirects
+    server_names:
+    - www.buildbot.net
+    - www.buildbot.org
+    - buildbot.org
+    target_url: "http://{{ web_host_name }}"
+
+# vim:ts=2:sw=2:noai:nosi

local.yml

@@ -27,5 +27,6 @@
 # Jails
 - include: "jail-ns1.yml"
 - include: "jail-nine.yml"
+- include: "jail-www.yml"
 
 # vim:ts=2:sw=2:noai:nosi