- Consistent indentation.

- Don't install apache2, already covered by apache dependency.
- Removed support for Trusty, don't have cgit packaged.

meta/main.yml

@@ -11,7 +11,6 @@ galaxy_info:
     - jessie
   - name: Ubuntu
     versions:
-    - trusty
     - xenial
   galaxy_tags: [ git, scm, gitolite ]
 dependencies:

molecule.yml

@@ -18,8 +18,6 @@ vagrant:
     box: kaorimatz/openbsd-6.0-amd64
   - name: jessie
     box: debian/jessie64
-  - name: trusty
-    box: ubuntu/trusty64
   - name: xenial
     box: ubuntu/xenial64
   instances:
@@ -57,10 +55,3 @@ docker:
     environment:
         DEBIAN_FRONTEND: noninteractive
         container: docker
-  - name: gitolite-trusty
-    image: ubuntu
-    image_version: trusty
-    command: /sbin/init
-    environment:
-        DEBIAN_FRONTEND: noninteractive
-        container: docker

tasks/cgit.yml

@@ -2,15 +2,10 @@
 # tasks file for cgit
 - name: APT install cgit
   apt:
-      name: '{{ item }}'
+    name: ['cgit', 'python-docutils']
     state: present
     update_cache: yes
     cache_valid_time: 3600
-  with_items:
-      - cgit
-      - git
-      - apache2
-      - python-docutils
 
 - name: Allow Apache to access to gitolite repositories
   user:
@@ -38,8 +33,7 @@
   notify:
     - Reload Apache
 
-- name: Add symlink for rst2html (hack, fixed in Stretch)
-  when: ansible_distribution_major_version|int < 9
+- name: Add symlink for rst2html (workaround, bug fixed in Stretch)
   file:
     src: /usr/share/docutils/scripts/python2/rst2html
     dest: /usr/local/bin/rst2html.py

tasks/main.yml

@@ -4,13 +4,10 @@
   assert:
     that:
         - ansible_os_family in ['Debian']
-        - ansible_distribution_release in ['xenial', 'trusty', 'jessie']
+        - ansible_distribution_release in ['xenial', 'jessie']
         - gitolite_public_key is defined
 
 - name: APT install
-  with_items:
-  - gitolite3
-  - curl
   apt:
     name: ['curl', 'gitolite3']
     state: present