Browse Source

finishing touches

Josh Bicking 5 years ago
parent
commit
b3edccfc53
3 changed files with 15 additions and 3 deletions
  1. 2 2
      hosts
  2. 12 0
      roles/nas/tasks/main.yml
  3. 1 1
      roles/web/tasks/main.yml

+ 2 - 2
hosts

@@ -1,8 +1,8 @@
 all:
   hosts:
     web:
-      ansible_ssh_private_key_file: ~/.ssh/internal_ed25519
+      ansible_ssh_private_key_file: ~/.ssh/orcha_ed25519
     nas:
-      ansible_ssh_private_key_file: ~/.ssh/internal_ed25519
+      ansible_ssh_private_key_file: ~/.ssh/orcha_ed25519
     orcha:
       ansible_connection: local

+ 12 - 0
roles/nas/tasks/main.yml

@@ -16,6 +16,18 @@
       - nfs-common
       - nfs-kernel-server
 
+- name: Format the data drive
+  filesystem:
+    fstype: ext4
+    dev: /dev/sdb1
+
+- name: Mount the data drive
+  mount:
+    src: /dev/sdb1
+    path: /nfs
+    fstype: ext4
+    state: mounted
+
 - name: copy /etc/exports
   template:
     src: templates/nas/etc/exports.j2

+ 1 - 1
roles/web/tasks/main.yml

@@ -104,4 +104,4 @@
   cron:
     name: "renew certs and copy"
     special_time: weekly
-    job: '/usr/local/bin/certbot renew --post-hook "cp -L /etc/letsencrypt/live/jibby.org/cert.pem /static_certs/jibby.org.crt && cp -L /etc/letsencrypt/live/jibby.org/privkey.pem /static_certs/jibby.org.key && cp -L /etc/letsencrypt/live/jibby.org-0001/cert.pem /static_certs/shared.crt && cp -L /etc/letsencrypt/live/jibby.org-0001/privkey.pem /static_certs/shared.key && systemctl restart nginx"'
+    job: '/root/.local/bin/certbot renew --post-hook "mkdir -p  /static_certs && cp -L /etc/letsencrypt/live/jibby.org/cert.pem /static_certs/jibby.org.crt && cp -L /etc/letsencrypt/live/jibby.org/privkey.pem /static_certs/jibby.org.key && cp -L /etc/letsencrypt/live/jibby.org-0001/cert.pem /static_certs/shared.crt && cp -L /etc/letsencrypt/live/jibby.org-0001/privkey.pem /static_certs/shared.key && docker restart compose_nginx_proxy_1"'