[Pending] New syntax

consuldemocracy · Oct 10, 2023 · 06bd6bd · 06bd6bd
1 parent fd41953
commit 06bd6bd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 48 deletions.
diff --git a/group_vars/all b/group_vars/all
@@ -47,6 +47,10 @@ smtp_authentication: "plain"
 
 # Node.js
 fnm_dir: "{{ home_dir }}/.fnm"
+fnm_command: "export PATH=\"{{ fnm_dir }}:$PATH\" && eval \"$(fnm env)\""
+
+# RVM
+rvm_command: "source {{ home_dir }}/.rvm/scripts/rvm"
 
 # Errbit
 errbit: False

diff --git a/roles/errbit/tasks/main.yml b/roles/errbit/tasks/main.yml
@@ -146,11 +146,7 @@
     replace: '  errbit_host: "https://{{ errbit_domain }}"'
 
 - name: Restart CONSUL DEMOCRACY
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bin/rails restart RAILS_ENV={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bin/rails restart RAILS_ENV={{ env }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash

diff --git a/roles/nodejs/tasks/main.yml b/roles/nodejs/tasks/main.yml
@@ -14,19 +14,13 @@
   register: node_version
 
 - name: Install nodejs via fnm
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    eval "$(fnm env)"
-    fnm install {{ node_version.stdout }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && fnm install {{ node_version.stdout }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash
 
 - name: Install Node packages
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    eval "$(fnm env)"
-    fnm exec npm install --production
+  shell: "{{ rvm_command }} && {{ fnm_command }} && npm install --production"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash
diff --git a/roles/puma/tasks/main.yml b/roles/puma/tasks/main.yml
@@ -23,11 +23,7 @@
   when: puma_process.stat.exists == True
 
 - name: Start puma
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bundle exec puma -C {{ release_dir }}/config/puma/{{ env }}.rb -e {{ env }} -d
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bundle exec puma -C {{ release_dir }}/config/puma/{{ env }}.rb -e {{ env }} -d"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash

diff --git a/roles/queue/tasks/main.yml b/roles/queue/tasks/main.yml
@@ -1,9 +1,5 @@
 - name: Start DelayedJobs queue
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    RAILS_ENV={{ env }} bin/delayed_job -m -n 2 restart
+  shell: "{{ rvm_command }} && {{ fnm_command }} && RAILS_ENV={{ env }} bin/delayed_job -m -n 2 restart"
   args:
     executable: /bin/bash
     chdir: "{{ release_dir }}"
diff --git a/roles/rails/tasks/main.yml b/roles/rails/tasks/main.yml
@@ -60,11 +60,7 @@
     replace: '{{ env }}:\n  # secret_key_base: ""\n  server_name: "{{ server_hostname }}"'
 
 - name: Generate secret key
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bin/rake secret RAILS_ENV={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bin/rake secret RAILS_ENV={{ env }}"
 
   register: secret_key_base
   args:
@@ -85,41 +81,25 @@
   when: domain is not defined
 
 - name: Create Database
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bin/rake db:migrate RAILS_ENV={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bin/rake db:migrate RAILS_ENV={{ env }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash
 
 - name: Load configuration seeds
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bin/rake db:seed RAILS_ENV={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bin/rake db:seed RAILS_ENV={{ env }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash
 
 - name: Precompile assets
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bin/rake assets:precompile RAILS_ENV={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bin/rake assets:precompile RAILS_ENV={{ env }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash
 
 - name: Update crontab with whenever
-  shell: |
-    export PATH="{{ fnm_dir }}:$PATH"
-    source {{ home_dir }}/.rvm/scripts/rvm
-    eval "$(fnm env)"
-    bundle exec whenever --update-crontab {{ app_name }} --set environment={{ env }}
+  shell: "{{ rvm_command }} && {{ fnm_command }} && bundle exec whenever --update-crontab {{ app_name }} --set environment={{ env }}"
   args:
     chdir: "{{ release_dir }}"
     executable: /bin/bash