Okay, turns out we need to separate out roles
This makes a bit more sense now, I guess
This commit is contained in:
parent
ab17391c0b
commit
42f8c8aa35
@ -62,12 +62,8 @@
|
|||||||
gitweb_url: "www.9iron.club"
|
gitweb_url: "www.9iron.club"
|
||||||
gitweb_webroot: "/var/www/www"
|
gitweb_webroot: "/var/www/www"
|
||||||
tags: [ web, webroot, 9i ]
|
tags: [ web, webroot, 9i ]
|
||||||
- role: gitweb
|
- hosts: web1.9iron.club
|
||||||
vars:
|
roles:
|
||||||
gitweb_repo: "https://git.9iron.club/salt/desultd"
|
|
||||||
gitweb_url: "desu.ltd"
|
|
||||||
gitweb_webroot: "/var/www/desultd"
|
|
||||||
tags: [ web, webroot, desu ]
|
|
||||||
- role: redirect
|
- role: redirect
|
||||||
vars:
|
vars:
|
||||||
redirect_from: "otwstudios.org"
|
redirect_from: "otwstudios.org"
|
||||||
@ -80,3 +76,11 @@
|
|||||||
gitweb_url: "www.otwstudios.org"
|
gitweb_url: "www.otwstudios.org"
|
||||||
gitweb_webroot: "/var/www/otwstudios.org"
|
gitweb_webroot: "/var/www/otwstudios.org"
|
||||||
tags: [ web, webroot, otw ]
|
tags: [ web, webroot, otw ]
|
||||||
|
- hosts: web1.9iron.club
|
||||||
|
roles:
|
||||||
|
- role: gitweb
|
||||||
|
vars:
|
||||||
|
gitweb_repo: "https://git.9iron.club/salt/desultd"
|
||||||
|
gitweb_url: "desu.ltd"
|
||||||
|
gitweb_webroot: "/var/www/desultd"
|
||||||
|
tags: [ web, webroot, desu ]
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
cmd: "a2ensite {{ gitweb_url }}.conf"
|
cmd: "a2ensite {{ gitweb_url }}.conf"
|
||||||
creates: "/etc/apache2/sites-enabled/{{ gitweb_url }}.conf"
|
creates: "/etc/apache2/sites-enabled/{{ gitweb_url }}.conf"
|
||||||
notify: restart apache
|
notify: restart apache
|
||||||
|
- name: Debug site name
|
||||||
|
debug:
|
||||||
|
msg: "{{ gitweb_url }} at {{ gitweb_webroot }} from {{ gitweb_repo }}"
|
||||||
- name: Generate certificate
|
- name: Generate certificate
|
||||||
include_role:
|
include_role:
|
||||||
name: https
|
name: https
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
---
|
---
|
||||||
- name: "Register certificate for {{ website_url }}"
|
- name: "Register certificate for {{ website_url }}"
|
||||||
block:
|
block:
|
||||||
|
- name: Debug info
|
||||||
|
debug:
|
||||||
|
msg: "Installing cert for {{ website_url }}"
|
||||||
- name: Install SSL-required packages
|
- name: Install SSL-required packages
|
||||||
apt:
|
apt:
|
||||||
name: python3-openssl
|
name: python3-openssl
|
||||||
|
Loading…
Reference in New Issue
Block a user