data/router/build.conf

@@ -0,0 +1,31 @@
+server {
+	listen 80;
+
+	server_name build.haiku-os.org;
+	access_log off;
+	error_log off;
+	return 301 https://$server_name$request_uri;
+}
+
+server {
+	listen 443 ssl http2;
+
+	server_name build.haiku-os.org;
+
+	ssl_certificate /etc/letsencrypt/live/build.haiku-os.org/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/build.haiku-os.org/privkey.pem;
+	location /buildbot {
+		proxy_bind $server_addr;
+		proxy_pass http://infrastructure_buildbot_1:80;
+	}
+}
+
+# buildbot.haiku-os.org (just 301 to build.)
+server {
+	listen 80;
+
+	server_name buildbot.haiku-os.org;
+	access_log off;
+	error_log off;
+	return 301 https://build.haiku-os.org/buildbot;
+}

docker-compose.yaml

@@ -14,8 +14,8 @@ services:
       - gerrit
       - cgit
   gerrit:
-    ports:
-      #- "94.130.158.38:22:29418" # PROD-ONLY
+#    ports:
+#      - "94.130.158.38:22:29418" # PROD-ONLY
     image: haiku/gerrit
     volumes:
       - gerrit_data:/var/gerrit/review_site
@@ -65,7 +65,16 @@ services:
       - trac_data:/var/trac
     depends_on:
       - postgres
+  buildbot:
+    image: buildbot/buildbot-master:v1.0.0
+    volumes:
+      - buildbot_config:/var/lib/buildbot
+    links:
+      - postgres
+    depends_on:
+      - postgres
 volumes:
+  buildbot_config:
   gerrit_data:
   ports_mirror:
   postgres_data:

tools/cert-renew

@@ -8,7 +8,7 @@
 # TODO: Test each certificate for validity? If no certs
 # expire soon, don't bring down router container?
 
-DOMAINS="review.haiku-os.org cgit.haiku-os.org dev.haiku-os.org git.haiku-os.org haiku-os.org api.haiku-os.org userguide.haiku-os.org ports-mirror.haiku-os.org dev.haiku-os.org"
+DOMAINS="review.haiku-os.org cgit.haiku-os.org dev.haiku-os.org git.haiku-os.org haiku-os.org api.haiku-os.org userguide.haiku-os.org ports-mirror.haiku-os.org dev.haiku-os.org build.haiku-os.org"
 LOG="/var/log/letsencrypt.log"
 CONTEXT="/root/infrastructure"
 

tools/fake-cert

@@ -9,7 +9,7 @@
 # To regenerate fakecerts, rm -rf /etc/letsencrypt/live/*
 
 CERT_ROOT="/etc/letsencrypt/live"
-DOMAINS="review.haiku-os.org cgit.haiku-os.org git.haiku-os.org haiku-os.org api.haiku-os.org userguide.haiku-os.org ports-mirror.haiku-os.org dev.haiku-os.org"
+DOMAINS="review.haiku-os.org cgit.haiku-os.org git.haiku-os.org haiku-os.org api.haiku-os.org userguide.haiku-os.org ports-mirror.haiku-os.org dev.haiku-os.org build.haiku-os.org"
 mkdir -p $CERT_ROOT
 for i in $DOMAINS; do
 	if [ -d $CERT_ROOT/$i ]; then