Merge pull request #21 from christianharke/harmonize-src-paths

Harmonize src paths of template and copy source files

Author: frne

README.md

@@ -93,11 +93,11 @@ process. To do so, see the following config example:
     ...
     deploy_additional_templates:
       - { 
-        src: "templates/application.conf.j2", 
+        src: "application.conf.j2", 
         dest: "{{ deploy_dir_config }}/application.conf" 
       }
       - { 
-        src: "templates/logback.xml.j2", 
+        src: "logback.xml.j2", 
         dest: "{{ deploy_dir_config }}/logback.xml", 
         mode: "0600"
       }
@@ -109,7 +109,7 @@ process. To do so, see the following config example:
     ...
     deploy_additional_copy:
       - { 
-        src: "/path/to/file", 
+        src: "file", 
         dest: "{{ deploy_dir_app }}/file",
         mode: "0644" 
       }

defaults/main.yml

@@ -147,11 +147,11 @@ deploy_service_type: default
 
 deploy_service_name: "{{ deploy_app_name | lower }}-{{ deploy_instance_nr }}"
 
-deploy_service_upstart_template: "templates/service/upstart.conf.j2"
+deploy_service_upstart_template: "service/upstart.conf.j2"
 
 deploy_service_upstart_location: "/etc/init/{{ deploy_app_name | lower }}-{{ deploy_instance_nr }}.conf"
 
-deploy_service_systemd_template: "templates/service/systemd.service.j2"
+deploy_service_systemd_template: "service/systemd.service.j2"
 
 deploy_service_systemd_location: "/etc/systemd/system/{{ deploy_app_name | lower }}-{{ deploy_instance_nr }}.service"
 

tasks/additional.yml

@@ -30,7 +30,7 @@
 - name: "Additional - Deploy copy files"
   become: yes
   become_user: "{{ deploy_app_user }}"
-  template:
+  copy:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: "{{ item.user | default(deploy_app_user) }}"

tests/playbook/deploy.yml

@@ -10,7 +10,7 @@
     deploy_app_user: "bot-user"
     deploy_app_group: "bot-group"
     deploy_additional_templates:
-      - { src: "templates/application.conf.j2", dest: "{{ deploy_dir_config }}/application.conf" }
-      - { src: "templates/logback.xml.j2", dest: "{{ deploy_dir_config }}/logback.xml", mode: 600 }
+      - { src: "application.conf.j2", dest: "{{ deploy_dir_config }}/application.conf" }
+      - { src: "logback.xml.j2", dest: "{{ deploy_dir_config }}/logback.xml", mode: 600 }
   roles:
     - { role: ../../../ansible-java-deployment }