From e85a85c5e4c125643e642da77888d2107f1170ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Wed, 6 May 2020 15:23:20 +0200 Subject: [PATCH 1/8] #3 Fix typo in both contributing files --- .github/CONTRIBUTING.md | 2 +- CHANGELOG.md | 5 +++++ {{cookiecutter.app_name}}_role/.github/CONTRIBUTING.md | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e67a0d4..bc1f6f3 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -76,7 +76,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com ### Pull Requests * Fill in [the required template](PULL_REQUEST_TEMPLATE.md) -* Any pull request should has **idealista:develop** as base branch. +* Any pull request should have **idealista:develop** as base branch. ### Changelog diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cce398..3b83536 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). +## Unreleased + +### Fixed +- *[#3](https://github.com/idealista/cookiecutter-ansible-role/issues/3) Fix typo in both contributing files* @pablogcaldito + ## [1.0.0](https://github.com/idealista/cookiecutter-ansible-role/tree/1.0.0) (2020-04-28) ### Added diff --git a/{{cookiecutter.app_name}}_role/.github/CONTRIBUTING.md b/{{cookiecutter.app_name}}_role/.github/CONTRIBUTING.md index e67a0d4..bc1f6f3 100644 --- a/{{cookiecutter.app_name}}_role/.github/CONTRIBUTING.md +++ b/{{cookiecutter.app_name}}_role/.github/CONTRIBUTING.md @@ -76,7 +76,7 @@ Enhancement suggestions are tracked as [GitHub issues](https://guides.github.com ### Pull Requests * Fill in [the required template](PULL_REQUEST_TEMPLATE.md) -* Any pull request should has **idealista:develop** as base branch. +* Any pull request should have **idealista:develop** as base branch. ### Changelog From ac7a9aac6fbcecebb078dff6d9c96f31f27608e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Wed, 6 May 2020 16:22:12 +0200 Subject: [PATCH 2/8] #4 Upgrade to Goss v0.3.11 --- CHANGELOG.md | 5 +++++ {{cookiecutter.app_name}}_role/molecule/default/verify.yml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cce398..136f0c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). +## Unreleased + +### Added +- *[#4](https://github.com/idealista/cookiecutter-ansible-role/issues/4) Upgrade to Goss v0.3.11* @pablogcaldito + ## [1.0.0](https://github.com/idealista/cookiecutter-ansible-role/tree/1.0.0) (2020-04-28) ### Added diff --git a/{{cookiecutter.app_name}}_role/molecule/default/verify.yml b/{{cookiecutter.app_name}}_role/molecule/default/verify.yml index 3eb78c6..67aa63b 100644 --- a/{{cookiecutter.app_name}}_role/molecule/default/verify.yml +++ b/{{cookiecutter.app_name}}_role/molecule/default/verify.yml @@ -8,10 +8,10 @@ - {{ cookiecutter.app_name }} become: true vars: - goss_version: v0.3.10 + goss_version: v0.3.11 goss_arch: amd64 goss_dst: /usr/local/bin/goss - goss_sha256sum: 150f25495ca0d1d4fd2ef8d0e750dbd767a15e9a522505f99b61dd1dd40a76d4 + goss_sha256sum: 7a751c102abac61fd8dff45f87f36c3732cb5158e1414ab78e6877864fc2f7a4 goss_url: "https://github.com/aelsabbahy/goss/releases/download/{% raw %}{{{% endraw %} goss_version {% raw %}}}{% endraw %}/goss-linux-{% raw %}{{{% endraw %} goss_arch {% raw %}}}{% endraw %}" goss_test_directory: /tmp goss_format: documentation From e0dbecd5b71195152037a1e7c721e3d92af470b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Thu, 2 Jul 2020 12:22:30 +0200 Subject: [PATCH 3/8] #7 Fix bug in in the check version task in install.yml --- CHANGELOG.md | 1 + {{cookiecutter.app_name}}_role/tasks/install.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd085ab..3d36973 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch - *[#4](https://github.com/idealista/cookiecutter-ansible-role/issues/4) Upgrade to Goss v0.3.11* @pablogcaldito ### Fixed +- *[#7](https://github.com/idealista/cookiecutter-ansible-role/issues/7) Fix bug in in the check version task in install.yml* @pablogcaldito - *[#3](https://github.com/idealista/cookiecutter-ansible-role/issues/3) Fix typo in both contributing files* @pablogcaldito ## [1.0.0](https://github.com/idealista/cookiecutter-ansible-role/tree/1.0.0) (2020-04-28) diff --git a/{{cookiecutter.app_name}}_role/tasks/install.yml b/{{cookiecutter.app_name}}_role/tasks/install.yml index facc2e9..6a02571 100644 --- a/{{cookiecutter.app_name}}_role/tasks/install.yml +++ b/{{cookiecutter.app_name}}_role/tasks/install.yml @@ -36,7 +36,7 @@ when: {{ cookiecutter.app_name }}_log_file is defined - name: {{ cookiecutter.app_name | upper }} | Check {{ cookiecutter.app_name }} version - command: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }} --version {% raw %}}}{% endraw %}" + command: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_exec_name {% raw %}}}{% endraw %} --version" register: {{ cookiecutter.app_name }}_check changed_when: false ignore_errors: true From 5aa4dea3b7addf3a379d98475771bc4713c570fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Su=C3=A1rez?= Date: Thu, 20 Aug 2020 13:25:01 +0200 Subject: [PATCH 4/8] Remove Vagrant references from .gitignores --- .gitignore | 1 - {{cookiecutter.app_name}}_role/{% raw %}.gitignore{% endraw %} | 1 - 2 files changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6959226..6e3ff8e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ tests/.cache __pycache__ .pytest_cache .molecule -.vagrant .cache *.iml diff --git a/{{cookiecutter.app_name}}_role/{% raw %}.gitignore{% endraw %} b/{{cookiecutter.app_name}}_role/{% raw %}.gitignore{% endraw %} index c4029e0..c45c461 100644 --- a/{{cookiecutter.app_name}}_role/{% raw %}.gitignore{% endraw %} +++ b/{{cookiecutter.app_name}}_role/{% raw %}.gitignore{% endraw %} @@ -4,7 +4,6 @@ tests/.cache __pycache__ .pytest_cache .molecule -.vagrant .cache *.iml From f0fe1e0b29747c9584095e61cd20674f4b0b3d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Su=C3=A1rez?= Date: Thu, 20 Aug 2020 13:25:31 +0200 Subject: [PATCH 5/8] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d36973..c04c7c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## Unreleased +### Removed +- *[#9](https://github.com/idealista/cookiecutter-ansible-role/issues/9) Remove Vagrant pattern from role gitignore file* @vicsufer ### Added - *[#4](https://github.com/idealista/cookiecutter-ansible-role/issues/4) Upgrade to Goss v0.3.11* @pablogcaldito From e682a7896216c15f483c13b26846cbeefc0971b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Mon, 7 Sep 2020 10:12:41 +0200 Subject: [PATCH 6/8] #11 Fix parameterization of PrivateTmp --- CHANGELOG.md | 1 + {{cookiecutter.app_name}}_role/defaults/main.yml | 2 +- .../molecule/default/group_vars/all.yml | 3 +++ .../templates/{{ cookiecutter.app_name }}.service.j2 | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 {{cookiecutter.app_name}}_role/molecule/default/group_vars/all.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index c04c7c2..55b1269 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch - *[#4](https://github.com/idealista/cookiecutter-ansible-role/issues/4) Upgrade to Goss v0.3.11* @pablogcaldito ### Fixed +- *[#11](https://github.com/idealista/cookiecutter-ansible-role/issues/11) Fix parameterization of PrivateTmp* @pablogcaldito - *[#7](https://github.com/idealista/cookiecutter-ansible-role/issues/7) Fix bug in in the check version task in install.yml* @pablogcaldito - *[#3](https://github.com/idealista/cookiecutter-ansible-role/issues/3) Fix typo in both contributing files* @pablogcaldito diff --git a/{{cookiecutter.app_name}}_role/defaults/main.yml b/{{cookiecutter.app_name}}_role/defaults/main.yml index ecd33ef..b483174 100644 --- a/{{cookiecutter.app_name}}_role/defaults/main.yml +++ b/{{cookiecutter.app_name}}_role/defaults/main.yml @@ -56,5 +56,5 @@ - "flag1 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag1_value {% raw %}}}{% endraw %}" - "flag2 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag2_value {% raw %}}}{% endraw %}" -private_tmp_service: yes +{{ cookiecutter.app_name }}_private_tmp: true {% endif %} \ No newline at end of file diff --git a/{{cookiecutter.app_name}}_role/molecule/default/group_vars/all.yml b/{{cookiecutter.app_name}}_role/molecule/default/group_vars/all.yml new file mode 100644 index 0000000..9739ddb --- /dev/null +++ b/{{cookiecutter.app_name}}_role/molecule/default/group_vars/all.yml @@ -0,0 +1,3 @@ +--- + +{{ cookiecutter.app_name }}_private_tmp: false diff --git a/{{cookiecutter.app_name}}_role/templates/{{ cookiecutter.app_name }}.service.j2 b/{{cookiecutter.app_name}}_role/templates/{{ cookiecutter.app_name }}.service.j2 index 066f354..79cad12 100644 --- a/{{cookiecutter.app_name}}_role/templates/{{ cookiecutter.app_name }}.service.j2 +++ b/{{cookiecutter.app_name}}_role/templates/{{ cookiecutter.app_name }}.service.j2 @@ -6,7 +6,7 @@ Requires=network-online.target After=network-online.target [Service] -PrivateTmp={% raw %}{{ private_tmp_service }}{% endraw %} +PrivateTmp={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_private_tmp {% raw %}}}{% endraw %} User={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %} Group={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %} RuntimeDirectory={{ cookiecutter.app_name }} From 1b0074df0fa28d804c5edc566ae4ddc6eba0f714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Mon, 7 Sep 2020 10:20:14 +0200 Subject: [PATCH 7/8] #11 Update hooks --- hooks/post_gen_project.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 45cac30..7748edf 100755 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -22,6 +22,7 @@ def configureRole(): # Delete the service and things that reference the service os.remove("tasks/service.yml") os.remove("templates/{{ cookiecutter.app_name }}.service.j2") + shutil.rmtree("molecule/default/group_vars") # Remove or not the handlers folder if not {{ cookiecutter.has_handlers }}: shutil.rmtree("handlers") From 62261d172a71c51bdf13cbcf284497790f98aebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20G=C3=B3mez-Caldito?= Date: Thu, 17 Sep 2020 12:24:27 +0200 Subject: [PATCH 8/8] 1.0.1 release changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55b1269..83bdb36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). ## Unreleased +## [1.0.1](https://github.com/idealista/cookiecutter-ansible-role/tree/1.0.1) (2020-09-17) +## [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/1.0.0...1.0.1) ### Removed - *[#9](https://github.com/idealista/cookiecutter-ansible-role/issues/9) Remove Vagrant pattern from role gitignore file* @vicsufer