瀏覽代碼

[fifteen5] Clean up things that don't work

Colin Powell 3 年之前
父節點
當前提交
2f25632ce9
共有 2 個文件被更改,包括 8 次插入28 次删除
  1. 8 25
      ansible/roles/fifteen5/tasks/main.yml
  2. 0 3
      ansible/roles/fifteen5/templates/envrc.j2

+ 8 - 25
ansible/roles/fifteen5/tasks/main.yml

@@ -20,29 +20,6 @@
     dest: /root/.ssh/id_ed25519
     mode: 0400
 
-- name: Nginx key file installed
-  copy:
-    src: key.pem
-    dest: /usr/local/etc/nginx/key.pem
-    owner: root
-    mode: 0644
-  notify: Nginx restarted
-
-- name: Nginx cert file installed
-  copy:
-    src: cert.pem
-    dest: /usr/local/etc/nginx/cert.pem
-    owner: root
-    mode: 0644
-  notify: Nginx restarted
-
-- name: Nginx site file installed
-  template:
-    src: nginx-site.conf.j2
-    dest: /usr/local/etc/nginx/sites/fifteen5.conf
-    mode: 0644
-  notify: Nginx restarted
-
 - name: Nginx location file installed
   copy:
     src: nginx-location.conf
@@ -152,12 +129,18 @@
   notify: Supervisor restarted
 
 - name: 15Five frontend files generated and copied
-  command: bash -lc "direnv exec /usr/local/src/fifteen5 /usr/local/bin/yarn && direnv exec /usr/local/src/fifteen5 /usr/local/bin/yarn build && direnv exec /usr/local/src/fifteen5 /usr/local/bin/python3.8 manage.py collectstatic --no-input"
+  command: bash -lc "direnv exec /usr/local/src/fifteen5 /usr/local/bin/yarn"
+  args:
+    chdir: "/usr/local/src/fifteen5"
+  tags:
+    - deploy
+
+- name: 15Five frontend files generated
+  command: bash -lc "direnv exec /usr/local/src/fifteen5 /usr/local/bin/python3.8 manage.py collectstatic --noinput && direnv exec /usr/local/src/fifteen5 /usr/local/bin/python3.8 manage.py collectstatic_js_reverse"
   args:
     chdir: "/usr/local/src/fifteen5"
   tags:
     - deploy
-    - never
 
 - name: 15Five reset database
   command: bash -lc "RESET_DB=True direnv exec /usr/local/src/fifteen5 /usr/local/bin/python3.8 /usr/local/src/fifteen5/manage.py run_local_scripts && direnv exec /usr/local/src/fifteen5 /usr/local/bin/python3.8 /usr/local/src/fifteen5/manage.py clearsessions"

+ 0 - 3
ansible/roles/fifteen5/templates/envrc.j2

@@ -33,9 +33,6 @@ export FF_REDIS_LOCATION=redis://:{{redis_password}}@cache.unbl.ink/
 export FF_SFTP_FORWARDER_SECRET=notasecret
 export FF_SFTP_ALLOW_DUPLICATE_FILES=True
 
-export FF_AWS_STORAGE_BUCKET_NAME_PUBLIC=local
-export FF_AWS_STORAGE_BUCKET_NAME_PRIVATE=local
-
 export FF_OKTA_LOCAL_DEV_API_KEY={{fifteenfive_okta_key}}
 export FF_OKTA_LOCAL_DEV_CERT={{fifteenfive_okta_cert}}
 export FF_OKTA_LOCAL_DEV_ID='exkvakjehhLMVGzDY4x6'