Better ansibles.

devops/ansible/roles/mjb-profile-buildserver/tasks/main.yml

@@ -9,9 +9,13 @@
   include_role:
     name: mjb-role-webapp
 
-- name: Support using ansible locally
-  include_tasks: 
-    file: ansible.yml
+- name: "Install SSH Key for manager to use rsync to webservers"
+  copy:
+    dest: /home/manager/.ssh/id_rsa
+    src: "{{ inventory_dir }}/files/ssh/id_rsa"
+    owner: manager
+    group: manager
+    mode: 0600
 
 - name: Install mjb.worker.service file.
   copy:

devops/ansible/roles/mjb-profile-certbot/tasks/main.yml

@@ -38,20 +38,6 @@
     state: started
     enabled: true
 
-- name: "Ensure /usr/bin/letsencrypt-cert-push"
-  copy:
-    dest: /usr/bin/letsencrypt-cert-push
-    content: "#!/bin/bash"
-    owner: root
-    group: root
-    mode: 0755
-
-- name: "Populatge rsync entires for letsencrypt-cert-push"
-  lineinfile:
-    path: /usr/bin/letsencrypt-cert-push
-    line: "rsync -rLptgoD -e \"ssh -o StrictHostKeyChecking=no\" /etc/letsencrypt/live root@{{ item }}:/etc/letsencrypt"
-  with_items: "{{ deploy_addresses }}"
-
 - name: Create /etc/letsencrypt/.secrets/
   file:
     state: directory

devops/ansible/roles/mjb-profile-panel/tasks/main.yml

@@ -11,8 +11,8 @@
 
 - name: Install mjb-web.service file.
   copy:
-    dest: /etc/systemd/system/mjb-web.service
-    src: "{{ role_path }}/files/mjb-web.service"
+    dest: /etc/systemd/system/mjb.panel.service
+    src: "{{ role_path }}/files/mjb.panel.service"
     owner: root
     group: root
     mode: 0644
@@ -25,9 +25,9 @@
     group: manager
     mode: 0600
 
-- name: Start & enable mjb-web
+- name: Start & enable mjb.panel
   service:
-    name: mjb-web
+    name: mjb.panel
     state: started
     enabled: true
 

devops/ansible/roles/mjb-role-webapp/tasks/webapp.yml

@@ -23,34 +23,6 @@
   become: true
   become_user: manager
 
-- name: Build MJB::Backend::Jekyll
-  shell: dzil build > build.log 2>&1
-  args:
-    chdir: /home/manager/mjb/libs/MJB-Backend-Jekyll
-    creates: /home/manager/mjb/libs/MJB-Backend-Jekyll/build.log
-  environment:
-    PATH:                '/home/manager/perl5/bin:/usr/local/bin:/usr/bin:/bin'
-    PERL5LIB:            '/home/manager/perl5/lib/perl5'
-    PERL_MB_OPT:         '--install_base "/home/manager/perl5"'
-    PERL_MM_OPT:         'INSTALL_BASE=/home/manager/perl5'
-    PERL_LOCAL_LIB_ROOT: '/home/manager/perl5'
-  become: true
-  become_user: manager
-
-- name: Install MJB::Backend::Jekyll
-  shell: cpanm MJB-Backend-Jekyll-*.tar.gz
-  args:
-    chdir: /home/manager/mjb/libs/MJB-Backend-Jekyll
-    creates: /home/manager/perl5/lib/perl5/MJB/Backend/Jekyll.pm
-  environment:
-    PATH:                '/home/manager/perl5/bin:/usr/local/bin:/usr/bin:/bin'
-    PERL5LIB:            '/home/manager/perl5/lib/perl5'
-    PERL_MB_OPT:         '--install_base "/home/manager/perl5"'
-    PERL_MM_OPT:         'INSTALL_BASE=/home/manager/perl5'
-    PERL_LOCAL_LIB_ROOT: '/home/manager/perl5'
-  become: true
-  become_user: manager
-
 - name: Build MJB::DB
   shell: dzil build > build.log 2>&1
   args:

devops/ansible/roles/mjb-role-webapp/templates/mjb.yml.j2

@@ -1,6 +1,4 @@
 ---
-customer_domain: {{ customer_domain_name }}
-
 jekyll_init_repo: {{ mjb_web.jekyll_init_repo }}
 store_repo_base: {{ mjb_web.store_repo_base }}
 
@@ -8,6 +6,14 @@ database:
   mjb:    postgresql://{{ databases.mjb.user }}:{{ databases.mjb.pass }}@{{ databases.mjb.host }}/{{ databases.mjb.name }}
   minion: postgresql://{{ databases.minion.user }}:{{ databases.minion.pass }}@{{ databases.minion.host }}/{{ databases.minion.name }}
 
+domain_for_links: {{ panel_domain }}
+
+smtp:
+  host: {{ panel_smtp.host }}
+  from: {{ panel_smtp.from }}
+  sasl_username: {{ panel_smtp.sasl_username }} 
+  sasl_password: {{ panel_smtp.sasl_password }}
+
 secrets:
 {% for secret in secrets %}
   - {{ secret }}