diff --git a/docs/roles/composer.md b/docs/roles/composer.md index 74765170..c2fd2b1d 100644 --- a/docs/roles/composer.md +++ b/docs/roles/composer.md @@ -14,7 +14,7 @@ composer: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/docs/roles/config_generate.md b/docs/roles/config_generate.md index fe7aecfe..941b0680 100644 --- a/docs/roles/config_generate.md +++ b/docs/roles/config_generate.md @@ -11,7 +11,7 @@ config_generate: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/docs/roles/deploy_code.md b/docs/roles/deploy_code.md index 5d4cc722..fa1fec71 100644 --- a/docs/roles/deploy_code.md +++ b/docs/roles/deploy_code.md @@ -89,7 +89,7 @@ deploy_code: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/docs/roles/npm.md b/docs/roles/npm.md index 97f06cdc..45b401b0 100644 --- a/docs/roles/npm.md +++ b/docs/roles/npm.md @@ -18,7 +18,7 @@ npm: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/composer/README.md b/roles/composer/README.md index 74765170..c2fd2b1d 100644 --- a/roles/composer/README.md +++ b/roles/composer/README.md @@ -14,7 +14,7 @@ composer: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/composer/defaults/main.yml b/roles/composer/defaults/main.yml index d0dfbd1d..78876efc 100644 --- a/roles/composer/defaults/main.yml +++ b/roles/composer/defaults/main.yml @@ -7,7 +7,7 @@ composer: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/config_generate/README.md b/roles/config_generate/README.md index fe7aecfe..941b0680 100644 --- a/roles/config_generate/README.md +++ b/roles/config_generate/README.md @@ -11,7 +11,7 @@ config_generate: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/config_generate/defaults/main.yml b/roles/config_generate/defaults/main.yml index 8f1987eb..e9eb308a 100644 --- a/roles/config_generate/defaults/main.yml +++ b/roles/config_generate/defaults/main.yml @@ -3,7 +3,7 @@ config_generate: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/deploy_code/README.md b/roles/deploy_code/README.md index 5d4cc722..fa1fec71 100644 --- a/roles/deploy_code/README.md +++ b/roles/deploy_code/README.md @@ -89,7 +89,7 @@ deploy_code: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/deploy_code/defaults/main.yml b/roles/deploy_code/defaults/main.yml index b8220475..b28b479d 100644 --- a/roles/deploy_code/defaults/main.yml +++ b/roles/deploy_code/defaults/main.yml @@ -11,7 +11,7 @@ deploy_code: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/deploy_code/tasks/deploy.yml b/roles/deploy_code/tasks/deploy.yml index 032e1577..307a480c 100644 --- a/roles/deploy_code/tasks/deploy.yml +++ b/roles/deploy_code/tasks/deploy.yml @@ -28,7 +28,7 @@ - deploy_code.templates | length - deploy_operation == 'deploy' -- name: Create additional symlinks. +- name: Create additional symlinks in build dir. ansible.builtin.file: src: "{{ link.src }}" dest: "{{ deploy_path }}/{{ link.dest }}" @@ -38,6 +38,19 @@ loop_var: link when: - deploy_code.symlinks | length + - deploy_code.mount_type != "squashfs" + +- name: Create additional symlinks in deploy dir. + ansible.builtin.file: + src: "{{ link.src }}" + dest: "{{ live_symlink_dest }}/{{ link.dest }}" + state: link + with_items: "{{ deploy_code.symlinks }}" + loop_control: + loop_var: link + when: + - deploy_code.symlinks | length + - deploy_code.mount_type == "squashfs" # Additional vhost handling for feature branch builds. diff --git a/roles/live_symlink/defaults/main.yml b/roles/live_symlink/defaults/main.yml index eca23ad6..0a1aac69 100644 --- a/roles/live_symlink/defaults/main.yml +++ b/roles/live_symlink/defaults/main.yml @@ -6,7 +6,7 @@ live_symlink: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/npm/README.md b/roles/npm/README.md index 97f06cdc..45b401b0 100644 --- a/roles/npm/README.md +++ b/roles/npm/README.md @@ -18,7 +18,7 @@ npm: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc' diff --git a/roles/npm/defaults/main.yml b/roles/npm/defaults/main.yml index a29fcac7..57e45056 100644 --- a/roles/npm/defaults/main.yml +++ b/roles/npm/defaults/main.yml @@ -11,7 +11,7 @@ npm: # Specify any additional symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') - # create: whether to create the target if it does not exists. + # force: false # Set to true for the creation of the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # - src: '/var/simplesaml/etc'