Changeset 15607d3c in darkpeak-services


Ignore:
Timestamp:
Jul 23, 2018, 12:39:15 PM (18 months ago)
Author:
Mat Booth <mat.booth@…>
Branches:
ansible, keycloak, master, matrix, pleroma
Children:
71149717
Parents:
7cda9f40
git-author:
Mat Booth <mat.booth@…> (07/23/18 12:28:53)
git-committer:
Mat Booth <mat.booth@…> (07/23/18 12:39:15)
Message:

apache: Fix ordering issues when provisioning brand new machines

Location:
roles
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • roles/apache2/tasks/configure-apache-site.yml

    r7cda9f40 r15607d3c  
    3333    state: link
    3434
    35 # we want to reload apache config _now_ instead of waiting for the notify
     35# This file is supplied by the calling role, and included in the apache configuration
     36# by the above vhost file
     37
     38- name: Install custom site config
     39  template:
     40    src: apache.incl.conf.j2
     41    dest: "/etc/apache2/includes/{{ service_name }}.incl.conf"
     42    owner: root
     43    group: root
     44    mode: 0644
     45  notify:
     46    - reload apache2
     47
     48# We want to reload apache config _now_ instead of waiting for the notify
    3649# task to run so we can request certificates using certbot and have the
    3750# appropriate apache config in place for verification
     
    6073    - development_mode != true
    6174 
    62 # This file is supplied by the calling role, and included in the apache configuration
    63 # by the above vhost file
    64 
    65 - name: Install custom site config
    66   template:
    67     src: apache.incl.conf.j2
    68     dest: "/etc/apache2/includes/{{ service_name }}.incl.conf"
    69     owner: root
    70     group: root
    71     mode: 0644
    72   notify:
    73     - reload apache2
    74 
  • roles/ipsilon/tasks/main.yml

    r7cda9f40 r15607d3c  
    3030    - reload apache2
    3131
    32 # We are using apache to front the Ipsilon WSGI application
    33 - name: Configure apache for Ipsilon
    34   include: ../../apache2/tasks/configure-apache-site.yml
    35 
    3632- name: Add group
    3733  group:
     
    4844    system: yes
    4945    createhome: yes
     46
     47# We are using apache to front the Ipsilon WSGI application
     48- name: Configure apache for Ipsilon
     49  include: ../../apache2/tasks/configure-apache-site.yml
    5050
    5151# To avoid the time-consuming process of git cloneing and rebuilding from source
  • roles/trac/tasks/main.yml

    r7cda9f40 r15607d3c  
    1717    - reload apache2
    1818
    19 # We are using apache to front the Trac WSGI application
    20 - name: Configure SAML2 authentication for Trac
    21   include: ../../apache2/tasks/configure-apache-saml.yml
    22 - name: Configure Apache for Trac
    23   include: ../../apache2/tasks/configure-apache-site.yml
    24 
    2519- name: Add group
    2620  group:
     
    3731    system: yes
    3832    createhome: no
     33
     34# We are using apache to front the Trac WSGI application
     35- name: Configure SAML2 authentication for Trac
     36  include: ../../apache2/tasks/configure-apache-saml.yml
     37- name: Configure Apache for Trac
     38  include: ../../apache2/tasks/configure-apache-site.yml
    3939
    4040- name: Add postgresql user
Note: See TracChangeset for help on using the changeset viewer.