diff --git a/roles/blog/README.md b/roles/blog/README.md deleted file mode 100644 index d649b50..0000000 --- a/roles/blog/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# landingpage - -The public face of my server. -Not much to see here honestly, -just a few simple lines of html explaining what this server is about and how to contact me. - -I don't see anybody else benefiting massively from this role but me, -but if you want the same web presence go for it I suppose 😉 - -## Defaults - -``` -landingpage_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}" -``` - -The on-target directory where the proxy configuration file should be stashed. - -``` -landingpage_use_https: true -``` - -Whether the service should be reachable through http (port 80) or through https (port 443) and provision an https certificate. Usually you will want this to stay `true`. - -``` -landingpage_version: latest -``` - -The docker image version to be used in stack creation. - -``` -subdomain_alias: www -``` - -If the deployed container should be served over a uri that is not the stack name. -By default, it will be set to `www.yourdomain.com` - -if this option is not set it will be served on `landingpage.yourdomain.com` instead. - diff --git a/roles/blog/defaults/main.yml b/roles/blog/defaults/main.yml deleted file mode 100644 index fcf9a0f..0000000 --- a/roles/blog/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -# never got around to removing the master tag from the images -blog_version: master - -blog_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}" - -blog_use_https: true - -# the subdomain link blog will be reachable under -subdomain_alias: blog diff --git a/roles/blog/handlers/main.yml b/roles/blog/handlers/main.yml deleted file mode 100644 index 29ca5c2..0000000 --- a/roles/blog/handlers/main.yml +++ /dev/null @@ -1,53 +0,0 @@ -## Register reverse proxy -- name: Ensure upstream directory exists - ansible.builtin.file: - path: "{{ blog_upstream_file_dir }}" - state: directory - mode: '0755' - become: true - listen: "update blog upstream" - -- name: Update upstream template - ansible.builtin.template: - src: upstream.json.j2 - dest: "{{ blog_upstream_file_dir }}/upstream.json" - become: true - listen: "update blog upstream" - -# figure out if upstream id exists -- name: check {{ stack_name }} upstream - community.docker.docker_container_exec: - container: "{{ caddy_container_id }}" - command: > - curl localhost:2019/id/{{ stack_name }}_upstream/ - changed_when: False - register: result - become: true - listen: "update blog upstream" - -# upstream already exists, patch it -- name: remove old {{ stack_name }} upstream - community.docker.docker_container_exec: - container: "{{ caddy_container_id }}" - command: > - curl -X DELETE localhost:2019/id/{{ stack_name }}_upstream/ - become: true - when: (result.stdout | from_json)['error'] is not defined - listen: "update blog upstream" - -# upstream has to be created -- name: add {{ stack_name }} upstream - community.docker.docker_container_exec: - container: "{{ caddy_container_id }}" - command: > - curl -X POST -H "Content-Type: application/json" -d @{{ blog_upstream_file_dir }}/upstream.json localhost:2019/config/apps/http/servers/{{ (blog_use_https == True) | ternary(caddy_https_server_name, caddy_http_server_name) }}/routes/0/ - become: true - listen: "update blog upstream" - -- name: Ensure upstream directory is gone again - ansible.builtin.file: - path: "{{ blog_upstream_file_dir }}" - state: absent - become: true - listen: "update blog upstream" - diff --git a/roles/blog/meta/main.yml b/roles/blog/meta/main.yml deleted file mode 100644 index fbb1340..0000000 --- a/roles/blog/meta/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- - -galaxy_info: - author: Marty Oehme - description: Installs my personal public facing landing page as a docker stack service - license: GPL-3.0-only - min_ansible_version: 2.9 - galaxy_tags: [] - - -dependencies: - - docker - - docker-swarm - - caddy diff --git a/roles/blog/tasks/main.yml b/roles/blog/tasks/main.yml deleted file mode 100644 index 0637ae3..0000000 --- a/roles/blog/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -## install blog container -- name: Check upstream status - community.docker.docker_container_exec: - container: "{{ caddy_container_id }}" - command: > - curl localhost:2019/id/{{ stack_name }}_upstream/ - register: result - changed_when: (result.stdout | from_json) != (lookup('template', 'upstream.json.j2') | from_yaml) - become: true - notify: "update blog upstream" - -- name: Deploy blog to swarm - community.general.docker_stack: - name: "{{ stack_name }}" - state: present - prune: yes - compose: - - "{{ stack_compose }}" - become: true - tags: - - docker-swarm - notify: "update blog upstream" - diff --git a/roles/blog/templates/docker-stack.yml.j2 b/roles/blog/templates/docker-stack.yml.j2 deleted file mode 100644 index 1d83e61..0000000 --- a/roles/blog/templates/docker-stack.yml.j2 +++ /dev/null @@ -1,20 +0,0 @@ -version: '3.4' - -services: - app: - image: "{{ stack_image }}:{{ blog_version }}" - healthcheck: - test: ["CMD", "wget", "--spider", "-q", "localhost"] - interval: 1m - timeout: 10s - retries: 3 - start_period: 1m - entrypoint: sh -c "/docker-entrypoint.sh nginx -g 'daemon off;'" - networks: - - "{{ docker_swarm_public_network_name }}" - -networks: - "{{ docker_swarm_public_network_name }}": - external: true - - diff --git a/roles/blog/templates/upstream.json.j2 b/roles/blog/templates/upstream.json.j2 deleted file mode 100644 index a8af36a..0000000 --- a/roles/blog/templates/upstream.json.j2 +++ /dev/null @@ -1,40 +0,0 @@ -{ - "@id": "{{ stack_name }}_upstream", -{% if server_domain is not undefined and not none %} - "match": [ - { - "host": [ -{% if subdomain_alias is not undefined and not none %} - "{{ subdomain_alias }}.{{ server_domain }}" -{% else %} - "{{ stack_name }}.{{ server_domain }}" -{% endif %} - ] - } - ], -{% else %} - "match": [ - { - "path": [ -{% if subdomain_alias is not undefined and not none %} - "/{{ subdomain_alias }}*" -{% else %} - "/{{ stack_name }}*" -{% endif %} - , - "/" - ] - } - ], -{% endif %} - "handle": [ - { - "handler": "reverse_proxy", - "upstreams": [ - { - "dial": "{{ stack_name }}_app:80" - } - ] - } - ] -} diff --git a/roles/blog/vars/main.yml b/roles/blog/vars/main.yml deleted file mode 100644 index 565e61f..0000000 --- a/roles/blog/vars/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -stack_name: blog - -stack_image: "registry.gitlab.com/cloud-serve/blog" - -stack_compose: "{{ lookup('template', 'docker-stack.yml.j2') | from_yaml }}" diff --git a/roles/landingpage/defaults/main.yml b/roles/landingpage/defaults/main.yml index 2c47345..b47f57f 100644 --- a/roles/landingpage/defaults/main.yml +++ b/roles/landingpage/defaults/main.yml @@ -1,7 +1,6 @@ --- -# never got around to removing the master tag from the images -landingpage_version: master +landingpage_version: latest landingpage_upstream_file_dir: "{{ docker_stack_files_dir }}/{{ stack_name }}" diff --git a/roles/landingpage/vars/main.yml b/roles/landingpage/vars/main.yml index e3616a9..df7f3d7 100644 --- a/roles/landingpage/vars/main.yml +++ b/roles/landingpage/vars/main.yml @@ -2,6 +2,6 @@ stack_name: landingpage -stack_image: "registry.gitlab.com/cloud-serve/landing" +stack_image: "martyo/cloudserve-landing" stack_compose: "{{ lookup('template', 'docker-stack.yml.j2') | from_yaml }}" diff --git a/site.yml b/site.yml index 62f01e9..a99b30b 100644 --- a/site.yml +++ b/site.yml @@ -63,11 +63,6 @@ role: landingpage tags: landingpage - - name: Install my personal blog - import_role: - role: blog - tags: blog - - name: Install gitea import_role: role: gitea