Dev/cookiecutter-ansible-role-docker
1
0
Fork 0
forked from Mirrors/cookiecutter-ansible-role
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from idealista/bugs/11

Browse Source 
bugs/11
This commit is contained in:
Pablo Gómez-Caldito Gómez 2020-09-17 12:21:21 +02:00 committed by GitHub
commit 27b81421ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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 - *[#4](https://github.com/idealista/cookiecutter-ansible-role/issues/4) Upgrade to Goss v0.3.11* @pablogcaldito
### Fixed ### 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 - *[#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 - *[#3](https://github.com/idealista/cookiecutter-ansible-role/issues/3) Fix typo in both contributing files* @pablogcaldito

1
hooks/post_gen_project.py
View File

@ -22,6 +22,7 @@ def configureRole():
# Delete the service and things that reference the service # Delete the service and things that reference the service
os.remove("tasks/service.yml") os.remove("tasks/service.yml")
os.remove("templates/{{ cookiecutter.app_name }}.service.j2") os.remove("templates/{{ cookiecutter.app_name }}.service.j2")
shutil.rmtree("molecule/default/group_vars")
# Remove or not the handlers folder # Remove or not the handlers folder
if not {{ cookiecutter.has_handlers }}: if not {{ cookiecutter.has_handlers }}:
shutil.rmtree("handlers") shutil.rmtree("handlers")

2
{{cookiecutter.app_name}}_role/defaults/main.yml
View File

@ -56,5 +56,5 @@
- "flag1 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag1_value {% raw %}}}{% endraw %}" - "flag1 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag1_value {% raw %}}}{% endraw %}"
- "flag2 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag2_value {% raw %}}}{% endraw %}" - "flag2 {% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_flag2_value {% raw %}}}{% endraw %}"
private_tmp_service: yes {{ cookiecutter.app_name }}_private_tmp: true
{% endif %} {% endif %}

3
{{cookiecutter.app_name}}_role/molecule/default/group_vars/all.yml Normal file
View File

@ -0,0 +1,3 @@
---
{{ cookiecutter.app_name }}_private_tmp: false

2
{{cookiecutter.app_name}}_role/templates/{{ cookiecutter.app_name }}.service.j2
View File

@ -6,7 +6,7 @@ Requires=network-online.target
After=network-online.target After=network-online.target
[Service] [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 %} User={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}
Group={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %} Group={% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}
RuntimeDirectory={{ cookiecutter.app_name }} RuntimeDirectory={{ cookiecutter.app_name }}