Added etc/ssh copy (to /home/.ssh/)

Author: mblaschke

CHANGELOG.md

@@ -12,6 +12,7 @@ PHP Docker Boilerplate Changelog
 - Added blackfire.io
 - Added possiblity to disable Xdebug and Blackfire
 - Moved php.ini to etc/php/development.ini and etc/php/production.ini
+- Added ssh key/config (etc/ssh) setting for /home/.ssh/
 - Added possibility to use supervisorctl (as root)
 - Improved provisioning
 - Refactored layout

docker/main/centos/provision/roles/common/tasks/packages.yml

@@ -1,21 +1,42 @@
-- name: Install default packages
+- name: Install packages (system tools)
   yum:
     name:  '{{ item }}'
     state: present
   with_items:
-    # System tools
     - sudo
-    # Compression
+
+- name: Install packages (compression tools)
+  yum:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - zip
     - unzip
     - bzip2
-    # Graphic tools
+
+- name: Install packages (graphic tools)
+  yum:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - ImageMagick
-    # Networking tools
+
+- name: Install packages (network tools)
+  yum:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - wget
     - curl
     - net-tools
-    # Utils
+    - rsync
+
+- name: Install packages (general tools)
+  yum:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - moreutils
     - bind-utils
     - pygpgme
+

docker/main/centos/provision/roles/users/tasks/home-ssh.yml

@@ -0,0 +1,29 @@
+# create a directory if it doesn't exist
+- name: Create /home/.ssh/
+  file:
+    path:  /home/.ssh/
+    state: directory
+    mode:  0750
+    owner: "{{ DOCKER.CLI_USER }}"
+    group: "{{ DOCKER.CLI_USER }}"
+
+- name: Sync etc/ssh/ to /home/.ssh
+  local_action: synchronize src=/docker/etc/ssh/ dest=/home/.ssh/ perms=no
+  ignore_errors: True
+
+- name: Fix /home/.ssh/ permissions
+  file:
+    path:  /home/.ssh/
+    state: directory
+    owner: "{{ DOCKER.CLI_USER }}"
+    group: "{{ DOCKER.CLI_USER }}"
+    recurse: yes
+  ignore_errors: True
+
+- name: Fix ssh key permissions (if exists)
+  file:
+    path:  /home/.ssh/id_rsa
+    mode:  0600
+    owner: "{{ DOCKER.CLI_USER }}"
+    group: "{{ DOCKER.CLI_USER }}"
+  ignore_errors: True

docker/main/centos/provision/roles/users/tasks/main.yml

@@ -1,3 +1,7 @@
 - include: www-data.yml
   tags:
     - entrypoint
+
+- include: home-ssh.yml
+  tags:
+    - entrypoint

docker/main/ubuntu/provision/roles/common/tasks/packages.yml

@@ -1,21 +1,41 @@
-- name: Install default packages
+- name: Install packages (system tools)
   apt:
     name:  '{{ item }}'
     state: present
   with_items:
-    # System tools
     - sudo
-    # Compression
+
+- name: Install packages (compression tools)
+  apt:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - zip
     - unzip
     - bzip2
-    # Graphic tools
+
+- name: Install packages (graphic tools)
+  apt:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - imagemagick
     - graphicsmagick
-    # Networking tools
+
+- name: Install packages (network tools)
+  apt:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - wget
     - curl
     - net-tools
-    # Utils
+    - rsync
+
+- name: Install packages (general tools)
+  apt:
+    name:  '{{ item }}'
+    state: present
+  with_items:
     - moreutils
-    - dnsutils
+    - dnsutils

docker/main/ubuntu/provision/roles/users/tasks/home-ssh.yml

@@ -0,0 +1,29 @@
+# create a directory if it doesn't exist
+- name: Create /home/.ssh/
+  file:
+    path:  /home/.ssh/
+    state: directory
+    mode:  0750
+    owner: www-data
+    group: www-data
+
+- name: Sync etc/ssh/ to /home/.ssh
+  local_action: synchronize src=/docker/etc/ssh/ dest=/home/.ssh/ perms=no
+  ignore_errors: True
+
+- name: Fix /home/.ssh/ permissions
+  file:
+    path:  /home/.ssh/
+    state: directory
+    owner: www-data
+    group: www-data
+    recurse: yes
+  ignore_errors: True
+
+- name: Fix ssh key permissions (if exists)
+  file:
+    path:  /home/.ssh/id_rsa
+    mode:  0600
+    owner: www-data
+    group: www-data
+  ignore_errors: True

docker/main/ubuntu/provision/roles/users/tasks/main.yml

@@ -1,3 +1,7 @@
 - include: www-data.yml
   tags:
     - entrypoint
+
+- include: home-ssh.yml
+  tags:
+    - entrypoint