Skip to content

Commit

Permalink
Merge pull request #215 from lemberg/issue/214-file-permissions
Browse files Browse the repository at this point in the history
Address newly introduced issue(s) with file permissions
  • Loading branch information
T2L committed Aug 18, 2020
2 parents ff5b727 + e738c57 commit 53d4d18
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Draft Environment (Unreleased)

Fixes:

- [GH-214](https://github.com/lemberg/draft-environment/issues/214) - Address newly introduced issue(s) with file permissions. See https://github.com/ansible/ansible/pull/70221 and https://github.com/ansible/ansible/issues/71200

## Draft Environment 3.1.1, 2020-08-12

Updates:
Expand Down
6 changes: 6 additions & 0 deletions molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@

pre_tasks:

- name: Ensure Ansible temp directory exists
file:
path: /tmp/ansible
state: directory
mode: 0777

- name: Ensure base packages are installed
apt:
name:
Expand Down
2 changes: 2 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ platforms:
provisioner:
name: ansible
config_options:
defaults:
remote_tmp: /tmp/ansible
ssh_connection:
pipelining: true
2 changes: 2 additions & 0 deletions provisioning/roles/apache2/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
src: /tmp/mkcert/
dest: /etc/apache2/ssl
remote_src: true
mode: 0644
notify:
- Restart Apache2 web server
when:
Expand All @@ -80,6 +81,7 @@
dest: /etc/apache2/mods-available/dir.conf
regexp: "DirectoryIndex"
line: "DirectoryIndex index.php index.html"
mode: preserve

# Disable default virtual host created on Ubuntu/Debian.
- name: Disable default virtual host.
Expand Down
3 changes: 3 additions & 0 deletions provisioning/roles/draft/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
lineinfile:
path: ~/.bashrc
line: cd {{ ssh_default_directory }}
mode: preserve

- name: Ensure locale exists
locale_gen:
Expand All @@ -82,6 +83,7 @@
path: /etc/ssh/sshd_config
regexp: '^PasswordAuthentication '
line: 'PasswordAuthentication yes'
mode: preserve
notify:
- Restart SSH server

Expand All @@ -90,5 +92,6 @@
path: /etc/ssh/sshd_config
regexp: '^ChallengeResponseAuthentication '
line: 'ChallengeResponseAuthentication yes'
mode: preserve
notify:
- Restart SSH server

0 comments on commit 53d4d18

Please sign in to comment.