From ed1d84c575f195c315635df30ce833c577500d2c Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Thu, 24 Sep 2020 09:14:00 +0200
Subject: [PATCH] Bump abra, add swarm installer script

---
 Makefile                           | 14 +++++++-----
 abra/{installer => abra-installer} |  0
 abra/abra.conf                     |  2 +-
 compose.yml                        | 34 +++++++++++++++++++++++++++---
 swarm/swarm-installer              | 16 ++++++++++++++
 swarm/swarm.conf                   | 10 +++++++++
 6 files changed, 67 insertions(+), 9 deletions(-)
 rename abra/{installer => abra-installer} (100%)
 create mode 100644 swarm/swarm-installer
 create mode 100644 swarm/swarm.conf

diff --git a/Makefile b/Makefile
index 01e2c11..07ab0a3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,13 @@
-ABRA_VERSION := 0.1.2
-ABRA_SRC     := "https://git.autonomic.zone/autonomic-cooperative/abra/raw/tag/$(ABRA_VERSION)/installer"
+ABRA_VERSION     := 0.2.0
+ABRA_INSTALL_SRC := "https://git.autonomic.zone/autonomic-cooperative/abra/raw/tag/$(ABRA_VERSION)/script.d/abra-installer"
+SWARM_INSTALL_SRC := "https://git.autonomic.zone/autonomic-cooperative/abra/raw/tag/$(ABRA_VERSION)/script.d/swarm-installer"
 
-default: update-abra-installer
+default: update-abra-installer update-swarm-installer
 
 update-abra-installer:
-	@curl $(ABRA_SRC) > abra/installer
+	@curl $(ABRA_INSTALL_SRC) > abra/abra-installer
 
-.PHONY: update-abra-installer
+update-swarm-installer:
+	@curl $(SWARM_INSTALL_SRC) > swarm/swarm-installer
+
+.PHONY: update-abra-installer update-swarm-installer
diff --git a/abra/installer b/abra/abra-installer
similarity index 100%
rename from abra/installer
rename to abra/abra-installer
diff --git a/abra/abra.conf b/abra/abra.conf
index f6d4235..f2618ae 100644
--- a/abra/abra.conf
+++ b/abra/abra.conf
@@ -5,6 +5,6 @@ server {
   location / {
     root /var/www/abra-installer;
     add_header Content-Type text/plain;
-    index installer;
+    index abra-installer;
   }
 }
diff --git a/compose.yml b/compose.yml
index 931966d..8527cec 100644
--- a/compose.yml
+++ b/compose.yml
@@ -2,13 +2,13 @@
 version: "3.8"
 
 services:
-  nginx:
+  abra-installer:
     image: "nginx:stable"
     configs:
       - source: abra_conf
         target: /etc/nginx/conf.d/abra.conf
       - source: abra_installer
-        target: /var/www/abra-installer/installer
+        target: /var/www/abra-installer/abra-installer
     volumes:
       - "public:/var/www/abra-installer"
     networks:
@@ -24,13 +24,41 @@ services:
         - "traefik.http.routers.installer-scripts.entrypoints=web-secure"
         - "traefik.http.routers.installer-scripts.tls.certresolver=production"
 
+  swarm-installer:
+    image: "nginx:stable"
+    configs:
+      - source: swarm_conf
+        target: /etc/nginx/conf.d/swarm.conf
+      - source: swarm_installer
+        target: /var/www/swarm-installer/swarm-installer
+    volumes:
+      - "public:/var/www/swarm-installer"
+    networks:
+      - proxy
+    deploy:
+      update_config:
+        failure_action: rollback
+        order: start-first
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.installer-scripts.loadbalancer.server.port=80"
+        - "traefik.http.routers.installer-scripts.rule=Host(`install.swarm.autonomic.zone`)"
+        - "traefik.http.routers.installer-scripts.entrypoints=web-secure"
+        - "traefik.http.routers.installer-scripts.tls.certresolver=production"
+
 configs:
   abra_installer:
     name: abra_installer_v1
-    file: abra/installer
+    file: abra/abra-installer
   abra_conf:
     name: abra_conf_v1
     file: abra/abra.conf
+  swarm_installer:
+    name: swarm_installer_v1
+    file: swarm/swarm-installer
+  swarm_conf:
+    name: swarm_conf_v1
+    file: swarm/swarm.conf
 
 networks:
   proxy:
diff --git a/swarm/swarm-installer b/swarm/swarm-installer
new file mode 100644
index 0000000..4d6a3da
--- /dev/null
+++ b/swarm/swarm-installer
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+install_docker() {
+  echo "install_docker: TODO"
+}
+init_swarm() {
+  echo "init_swarm: TODO"
+}
+
+run_installation() {
+  install_docker
+  init_swarm
+}
+
+run_installation
+exit 0
diff --git a/swarm/swarm.conf b/swarm/swarm.conf
new file mode 100644
index 0000000..5e26790
--- /dev/null
+++ b/swarm/swarm.conf
@@ -0,0 +1,10 @@
+server {
+  listen         80 default_server;
+  server_name    install.swarm.autonomic.zone;
+
+  location / {
+    root /var/www/swarm-installer;
+    add_header Content-Type text/plain;
+    index swarm-installer;
+  }
+}