From 6ebcab155ed0034610a3b8d2f9335679d603e4c3 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 13 Apr 2020 19:39:42 +0200 Subject: [PATCH] Move to v2 format --- .drone.yml | 13 -------- Makefile | 7 ----- README.md | 7 +---- ansible/.vault.sh | 5 --- ansible/post-deploy.yml | 47 ---------------------------- ansible/pre-deploy.yml | 34 -------------------- ansible/requirements.yml | 6 ---- ansible/vars/all.yml | 7 ----- ansible/vars/ansible_become_pass.yml | 8 ----- ansible/vars/gandi_rest_token.yml | 8 ----- app.json | 5 --- deploy.d/config.yml | 9 ++++++ 12 files changed, 10 insertions(+), 146 deletions(-) delete mode 100755 ansible/.vault.sh delete mode 100644 ansible/post-deploy.yml delete mode 100644 ansible/pre-deploy.yml delete mode 100644 ansible/requirements.yml delete mode 100644 ansible/vars/all.yml delete mode 100644 ansible/vars/ansible_become_pass.yml delete mode 100644 ansible/vars/gandi_rest_token.yml delete mode 100644 app.json create mode 100644 deploy.d/config.yml diff --git a/.drone.yml b/.drone.yml index 8259914..2b6e593 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,20 +1,7 @@ --- kind: pipeline - name: default - steps: - - name: Build autonomic.zone docker image - image: docker:stable - volumes: - - name: docker_sock - path: /var/run/docker.sock - commands: - - docker build --no-cache -t autonomic/autonomic.zone:drone . - trigger: - branch: - - master - - name: Deploy Autonomic.zone with Dokku image: appleboy/drone-git-push:0.2.0-linux-amd64 settings: diff --git a/Makefile b/Makefile index 2d1357c..2c076da 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,3 @@ -DEV_DIST_DIR:=dist - -devserver: - @echo "Serving development site from $(DEV_DIST_DIR)" - @jekyll serve --watch --incremental --destination $(DEV_DIST_DIR) -.PHONY: devserver - dockerbuild: @docker build -t autonomic/autonomic.zone:testing . .PHONY: dockerbuild diff --git a/README.md b/README.md index 68d35d1..7fccb7c 100644 --- a/README.md +++ b/README.md @@ -2,18 +2,13 @@ [![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/autonomic.zone/status.svg)](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone) -> https://site.autonomic.zone +> https://autonomic.zone A [Jekyll] based site for the Autonomic Cooperative. The site is based on the [spectral-jekyll-theme] template. [jekyll]: https://jekyllrb.com/ [spectral-jekyll-theme]: https://github.com/andrewbanchich/spectral-jekyll-theme -# Deploy - -1. Push your changes to master and Dokku will try to automatically release -1. See the [Drone dashboard to see the build](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone/) - # Contribute Please see [CONTRIBUTING.md] for the juicy details. diff --git a/ansible/.vault.sh b/ansible/.vault.sh deleted file mode 100755 index 8f30d37..0000000 --- a/ansible/.vault.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu -o pipefail - -echo $(pass show hosts/autonomic-dokku/vault/password) diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml deleted file mode 100644 index 362e975..0000000 --- a/ansible/post-deploy.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- hosts: all - gather_facts: false - tasks: - - name: Load variables - include_vars: - dir: "{{ dokku_lib_root }}/data/ansible/autonomic.zone/vars/" - extensions: - - yml - - - name: Set HTTP 80 port proxy - dokku_ports: - app: autonomic.zone - mappings: - - "http:80:{{ http_port }}" - state: present - - - name: Setup LE certificates - shell: dokku letsencrypt autonomic.zone - args: - creates: /home/dokku/autonomic.zone/letsencrypt/certs - - - name: Setup LE certificates renew cron job - shell: dokku letsencrypt:cron-job --add - args: - creates: /home/dokku/autonomic.zone/letsencrypt/cron-job - - - name: Specify docker volume mounts - dokku_storage: - app: autonomic.zone - mounts: - - /home/dokku/autonomic.zone/letsencrypt/certs/current/key.pem:/etc/x509/https/tls.key - - /home/dokku/autonomic.zone/letsencrypt/certs/current/cert.pem:/etc/x509/https/tls.crt - - - name: Set HTTP 443 port - dokku_ports: - app: autonomic.zone - mappings: - - "https:443:{{ http_port }}" - state: present - - - name: Remove automatically configured ports - dokku_ports: - app: autonomic.zone - mappings: - - "http:4000:4000" - state: absent diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml deleted file mode 100644 index d3934c6..0000000 --- a/ansible/pre-deploy.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- hosts: all - gather_facts: false - tasks: - - name: Load variables - include_vars: - dir: "{{ dokku_lib_root }}/data/ansible/autonomic.zone/vars/" - extensions: - - yml - - - name: "Configure the {{ domain }} domain" - dokku_domains: - app: autonomic.zone - domains: - - "{{ domain }}" - state: present - - - name: Ensure default app configured domains go away - dokku_domains: - app: autonomic.zone - domains: - - autonomic.zone.dokku.autonomic.zone - state: absent - - - name: Configure the dokku app environment - dokku_config: - app: autonomic.zone - restart: false - config: - DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}" - JEKYLL_HOST: "0.0.0.0" - JEKYLL_PORT: "{{ http_port }}" - JEKYLL_CONFIG: "{{ jekyll_config }}" - JEKYLL_ENV: "{{ jekyll_env }}" diff --git a/ansible/requirements.yml b/ansible/requirements.yml deleted file mode 100644 index e2e3214..0000000 --- a/ansible/requirements.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- src: dokku_bot.ansible_dokku - version: v2020.3.24 - -- src: https://git.coop/decentral1se/autonomic.gandi/-/archive/0.0.5/autonomic.gandi-0.0.5.tar.gz - name: autonomic.gandi diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml deleted file mode 100644 index 6420da6..0000000 --- a/ansible/vars/all.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -ansible_python_interpreter: "/usr/bin/python3" -autonomic_admin_mail: "helo@autonomic.zone" -domain: "autonomic.zone" -http_port: "4000" -jekyll_config: "_config_prod.yml" -jekyll_env: "production" diff --git a/ansible/vars/ansible_become_pass.yml b/ansible/vars/ansible_become_pass.yml deleted file mode 100644 index abb21b9..0000000 --- a/ansible/vars/ansible_become_pass.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -ansible_become_pass: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 34396236353735666531323238656533643465303131663464613162396333313836363630666266 - 6539323631656635333864316166633064633366323936610a656137616334313534333635313232 - 35323561303763366563316631313638363333393763323935343563303963616334336639386462 - 3837383830616637360a373539613630356564363662393836366462666430353439353637303035 - 63396633303166343433313439303539313637306637663137313533316531616434 diff --git a/ansible/vars/gandi_rest_token.yml b/ansible/vars/gandi_rest_token.yml deleted file mode 100644 index 28c9136..0000000 --- a/ansible/vars/gandi_rest_token.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -gandi_rest_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65653461333739626564356366313338613561396163383161633561373736626138306633353261 - 3230376530616361343063346533633464643165643739310a303965353336353063353564643263 - 37396139643161346265616630633530353866356338386134383565363238393932666565663163 - 3831393731353735350a313235376463643439363833616263653637623363386532636132366662 - 65313835306637323066396232653166313262613333633061313266363338646334 diff --git a/app.json b/app.json deleted file mode 100644 index 3112a9b..0000000 --- a/app.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "autonomic.zone", - "description": "Autonomics website on the world wide web", - "repository": "https://git.autonomic.zone/autonomic-cooperative/autonomic.zone" -} diff --git a/deploy.d/config.yml b/deploy.d/config.yml new file mode 100644 index 0000000..235e107 --- /dev/null +++ b/deploy.d/config.yml @@ -0,0 +1,9 @@ +--- +port: "4000" +domain: "autonomic.zone" +env: + DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone" + JEKYLL_CONFIG: "_config_prod.yml" + JEKYLL_ENV: "production" + JEKYLL_HOST: "0.0.0.0" + JEKYLL_PORT: "4000"