Merge pull request #2 from solutionDrive/change-travis

Change travis

.travis.yml

@@ -1,29 +1,36 @@
 ---
-language: python
-python: "2.7"
+services: docker
 
-# Use the new container infrastructure
-sudo: false
+env:
+  - distro: ubuntu1804
+  - distro: ubuntu1604
+  - distro: ubuntu1404
+  - distro: debian9
+  - distro: debian8
 
-# Install ansible
-addons:
-  apt:
-    packages:
-    - python-pip
+before_script:
+  # Check for correct eof newlines
+  - wget -O ${PWD}/tests/check-eof-newline.sh https://gist.github.com/sd-lueckel/fd262b2570c270bf8695ed6bdd388727/raw/
+  - chmod +x ${PWD}/tests/check-eof-newline.sh
+  - ${PWD}/tests/check-eof-newline.sh
 
-install:
-  # Install ansible
-  - pip install ansible
+  # Check for line endings
+  - wget -O ${PWD}/tests/check-line-endings.sh https://gist.github.com/sd-lueckel/1114f569d0a60f3447b28cc7c82f8fd4/raw/
+  - chmod +x ${PWD}/tests/check-line-endings.sh
+  - ${PWD}/tests/check-line-endings.sh
 
-  # Check ansible version
-  - ansible --version
-
-  # Create ansible.cfg with correct roles_path
-  - printf '[defaults]\nroles_path=../' >ansible.cfg
+  # Check for trailing whitespaces
+  - wget -O ${PWD}/tests/check-trailing_whitespaces.sh https://gist.github.com/sd-lueckel/335ef1b6a9e996b384748a3e1cf15b61/raw/
+  - chmod +x ${PWD}/tests/check-trailing_whitespaces.sh
+  - ${PWD}/tests/check-trailing_whitespaces.sh
 
 script:
-  # Basic role syntax check
-  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+  # Download test shim.
+  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
+  - chmod +x ${PWD}/tests/test.sh
+
+  # Run tests.
+  - ${PWD}/tests/test.sh
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

meta/main.yml

@@ -1,4 +1,5 @@
 galaxy_info:
+  role_name: deployment
   author: solutionDrive GmbH
   description: Role to prepare servers for deployment
   company: solutionDrive GmbH
@@ -7,9 +8,15 @@ galaxy_info:
   min_ansible_version: 1.2
 
   platforms:
-  - name: Ubuntu
-    versions:
-    - all
+    - name: Ubuntu
+      versions:
+        - bionic
+        - xenial
+        - trusty
+    - name: Debian
+      versions:
+        - stretch
+        - jessie
 
   galaxy_tags:
     - server

tasks/authentication.yml

@@ -6,7 +6,6 @@
     owner: "{{ deployment_ssh_user }}"
     group: www-data
     mode: u=r,g=,o=
-  become: yes
 
 - name: Copy Public Deployment-Key
   copy:
@@ -15,15 +14,13 @@
     owner: "{{ deployment_ssh_user }}"
     group: www-data
     mode: u=rw,g=rw,o=r
-  become: yes
 
 - name: "create {{ deployment_auth_destination_path_ssh_user }} if it does not exist"
   file:
     state: directory
     path: "{{ deployment_auth_destination_path_ssh_user }}"
     owner: "{{ deployment_ssh_user }}"
     group: www-data
-  become: yes
 
 - name: "Store Toran-Authentication for composer installation for User {{ deployment_ssh_user }}"
   copy:
@@ -32,7 +29,6 @@
     owner: "{{ deployment_ssh_user }}"
     group: www-data
     mode: 0600
-  become: yes
   when: deployment_install_composer_auth
 
 - name: Copy Private Deployment-Key to root user if configured
@@ -42,7 +38,6 @@
     owner: root
     group: root
     mode: u=r,g=,o=
-  become: yes
   when: deployment_key_to_root_user
   notify: remove key from root
 
@@ -53,18 +48,24 @@
     owner: root
     group: root
     mode: u=rw,g=r,o=r
-  become: yes
   when: deployment_key_to_root_user
   notify: remove key from root
 
+- name: "Create /root/.composer/ path if it does not exists"
+  file:
+    state: directory
+    path: /root/.composer/
+    owner: root
+    group: root
+  when: deployment_install_composer_auth
+
 - name: Store Toran-Authentication for composer installation for User root
   copy:
     src: "{{ deployment_src_path }}{{ deployment_name_of_toran_auth_file }}"
     dest: /root/.composer/auth.json
     owner: root
     group: root
     mode: 0600
-  become: yes
   when: deployment_install_composer_auth
 
 - name: Copy Private Deployment-Key to www-data user
@@ -74,7 +75,6 @@
     owner: www-data
     group: www-data
     mode: u=r,g=,o=
-  become: yes
 
 - name: Copy Public Deployment-Key to www-data user
   copy:
@@ -83,4 +83,3 @@
     owner: root
     group: root
     mode: u=rw,g=r,o=r
-  become: yes

tasks/filesystem.yml

@@ -5,15 +5,13 @@
     state: directory
     owner: www-data
     group: www-data
-  become: yes
 
 - name: Create .ssh-Directory for root if configured
   file:
     path: /root/.ssh
     state: directory
     owner: root
     group: root
-  become: yes
   when: deployment_key_to_root_user
 
 - name: "Create bin-directory for user {{ deployment_ssh_user }}"
@@ -22,4 +20,3 @@
     state: directory
     owner: "{{ deployment_ssh_user }}"
     group: www-data
-  become: yes

tasks/git.yml

@@ -3,6 +3,3 @@
    src='gitconfig'
    dest='/etc/gitconfig'
    force=no
-  become: yes
-
-

tasks/known_hosts.yml

@@ -1,24 +1,24 @@
 ---
-- name: Ensure global known_hosts files exist
-  file:
-    path: "{{ deployment_global_ssh_known_hosts_file }}"
-    state: touch
-    mode: 0644
-
 - name: Add bitbucket.org to global known_hosts
   lineinfile:
     path: "{{ deployment_global_ssh_known_hosts_file }}"
     line: "{{ deployment_bitbucket_public_host_key }}"
+    create: yes
+    mode: 0644
     state: present
 
 - name: Add packagist.org to global known_hosts
   lineinfile:
     path: "{{ deployment_global_ssh_known_hosts_file }}"
     line: "{{ deployment_packagist_public_host_key }}"
+    create: yes
+    mode: 0644
     state: present
 
 - name: Add github.com to global known_hosts
   lineinfile:
     path: "{{ deployment_global_ssh_known_hosts_file }}"
     line: "{{ deployment_github_public_host_key }}"
+    create: yes
+    mode: 0644
     state: present

tasks/users.yml

@@ -3,7 +3,6 @@
   group:
     name: wheel
     state: present
-  become: yes
 
 - name: Ensure 'wheel'-group has passwordless sudo
   lineinfile:
@@ -12,20 +11,16 @@
     regexp: '^%wheel'
     line: '%wheel ALL=(ALL) NOPASSWD: ALL'
     validate: visudo -cf %s
-  become: yes
 
 - name: "Create User {{ deployment_ssh_user }}"
   user:
     name: "{{ deployment_ssh_user }}"
     group: "{{ deployment_ssh_user_group }}"
     groups: www-data,wheel
-    #shell: "{{ deployment_ssh_user_shell }}"
-  become: yes
 
 - name: "Create .ssh-Directory for {{ deployment_ssh_user }}"
   file:
     path:  "{{ deployment_key_destination_path_ssh_user }}"
     state: directory
     owner: "{{ deployment_ssh_user }}"
     group: www-data
-  become: yes

tests/files/auth.json

@@ -0,0 +1,3 @@
+{
+  "Authentication": "I am root!"
+}

tests/files/id_rsa

@@ -0,0 +1,2 @@
+This is a private key file!
+It is absolutly secure :D

tests/files/id_rsa.pub

@@ -0,0 +1,2 @@
+This is a public key file!
+It is ok to show it to the world :D

tests/test.yml

@@ -1,5 +1,14 @@
 ---
-- hosts: localhost
-  remote_user: root
+- hosts: all
+  become: yes
+
+  vars:
+    deployment_key_remove_key_from_root: false
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == 'Debian'
+
   roles:
-    - solutiondrive.deployment
+    - role_under_test