- Removed cgit role, box.

- Added gitolite (with cgit merged) role, box.
- Added apache role.

Vagrantfile

@@ -37,8 +37,8 @@ Vagrant.configure(2) do |config|
     nspawn.vm.box = "remram/debian-9-amd64"
   end
 
-  config.vm.define "cgit" do |cgit|
-    cgit.vm.hostname = "cgit.Ansible.vagrant"
+  config.vm.define "gitolite" do |gitolite|
+    gitolite.vm.hostname = "gitolite.Ansible.vagrant"
   end
 
   config.vm.define "wordpress" do |wordpress|

files/Ansible.vagrant/CA.srl

-100C
+100D

files/Ansible.vagrant/certs/cgit

------BEGIN CERTIFICATE-----
-MIIC+zCCAeOgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwGjEYMBYGA1UEAwwPQW5z
-aWJsZS52YWdyYW50MB4XDTE1MTEyNTE2MDEwN1oXDTI1MTEyMjE2MDEwN1owHzEd
-MBsGA1UEAwwUY2dpdC5BbnNpYmxlLnZhZ3JhbnQwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCh/NaAIXDpbqHfAMSBgaDoxP1V97Zqc6pJEzNFSO+pf0NX
-kYuS/9HRwnybosMm7KCS2SJKQCzncUqh3qc+9259CsEKa57G4rkucUJ36UDWTKLF
-cuPTE007fPaYQhJ/D876cDAjwGiwKXFPpNRHWITrAAKDDXTXYoYcuVrWhuxnBVH3
-MsM5SwEpPVlr90HkTwtsQGC4eWTqF/EFMvipM+pZkGQbgMykpiOXXN12gMz0CGEY
-/v+1QFvmAhBtlyOSU+OCgBccgTSuy2usUe4KP5AKz5Sa6KLh+m4ROUvMI20/ZOZ6
-KuSa0A6b8cCZukIGRsVi2A9d0Cq1Tj20GwEyEcn/AgMBAAGjRjBEMAkGA1UdEwQC
-MAAwNwYDVR0RBDAwLoIUY2dpdC5BbnNpYmxlLnZhZ3JhbnSCFiouY2dpdC5BbnNp
-YmxlLnZhZ3JhbnQwDQYJKoZIhvcNAQEFBQADggEBAHF3CGZPo5W+oL4mFHEwpWdb
-6wcnbROML0tXiIA/sRlW4jz2E+J9sWrQKM0NhPhEWmz8CkhUl0m5tmvfG1k/CaA8
-q7jf7TM3hd+r4+6QrlwUaUNqenXW0QVXIVvyVU+3JlnHcyuGkVN9LH8EBe6boumX
-NRwuHzepUSkyV+S1dahRibfjvdbpukvBnaSwLm1TpkrwKgZCLUaybGXb218S0zpC
-FA+0IYbfAY59OHedA1Sbu/XuPSJsMksdXJ5Px1BOLvmkNw8vSkmug3sX03/iYDXa
-cNtm1rajvBJ1WxEQ/uQm7wMCtR+BpRyeyRaeCgyL7LKRudDr2M0VgWd3KPs8zhA=
------END CERTIFICATE-----

files/Ansible.vagrant/certs/gitolite

+-----BEGIN CERTIFICATE-----
+MIIDBzCCAe+gAwIBAgICEA0wDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPQW5z
+aWJsZS52YWdyYW50MB4XDTE1MTIxMDA5MDAzOVoXDTI1MTIwNzA5MDAzOVowIzEh
+MB8GA1UEAwwYZ2l0b2xpdGUuQW5zaWJsZS52YWdyYW50MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAuhz18vjPsOUd4XNLZJ3DtESA+vIIDmhJg5JVNx92
+PPWT7/z+5NDMIada0A1k8nwuPHOsgo5SV3cSh8Ekna/A7nY/Ipd6qwIeHmT7VgIB
+mzLNmOnnLGOmN/vRsjI1JkHdgy8l4ZdwY0anX3ghFOSFA5M13t5XlCJrxFt/9mhk
+D2e/XKm/iioZevGco8XVFI28bCV6dHpzzRiiHXJOnXzceaBvjo+8NKNLw7ERn1hl
+y+6kNX+tgwL/cDZocYS37n2Rx2EUvim68FHkvweIoEeMkLf846ErHSEj6TVXQcbv
+g83IK2FpErzf2eJy3BN8kw506QCTVhVRZDGOi7wuEbhY8wIDAQABo04wTDAJBgNV
+HRMEAjAAMD8GA1UdEQQ4MDaCGGdpdG9saXRlLkFuc2libGUudmFncmFudIIaKi5n
+aXRvbGl0ZS5BbnNpYmxlLnZhZ3JhbnQwDQYJKoZIhvcNAQELBQADggEBAG4QeM3P
+9xVpkUnpNqhHWcDr7CCNYaFxLcN1dkFdG99CMoXWTuH4G/3p2BR8MvKJi9b5qzy+
+HQl8W5EwVRJ3iN8c7PiJuFmtbw5+YmlVVe5ZjLGicKk6YAj7W/gC+M0QWgq4/7qa
+DDGsXHDUa6+Vss3/L/fh0X1pTgzdLRXJyui9XpCxbpFjDY/JhB+xWd/psl6xBvhC
+ZK39lEEX+48BVguZb9hezuqt7ScF4EGXW9XoJxanim/I4KCiKPo+AAOBXID99uxF
+mPg8W6gyJfaLffjDwV02Jobr2PI6Jlyo30kglNFbKU+mx30aqjTZ241CENPodvw0
+RkyoM1+yXdNJ49E=
+-----END CERTIFICATE-----

files/Ansible.vagrant/keys/cgit

------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAofzWgCFw6W6h3wDEgYGg6MT9Vfe2anOqSRMzRUjvqX9DV5GL
-kv/R0cJ8m6LDJuygktkiSkAs53FKod6nPvdufQrBCmuexuK5LnFCd+lA1kyixXLj
-0xNNO3z2mEISfw/O+nAwI8BosClxT6TUR1iE6wACgw1012KGHLla1obsZwVR9zLD
-OUsBKT1Za/dB5E8LbEBguHlk6hfxBTL4qTPqWZBkG4DMpKYjl1zddoDM9AhhGP7/
-tUBb5gIQbZcjklPjgoAXHIE0rstrrFHuCj+QCs+Umuii4fpuETlLzCNtP2Tmeirk
-mtAOm/HAmbpCBkbFYtgPXdAqtU49tBsBMhHJ/wIDAQABAoIBAE8nVUlXDe2C+eYW
-Ye9GgHI9j+0qFiD+U/9ROoRol3OjlCx+Gk3CY6yz9F+4sNOcXPpkz7Sol0igu29N
-dTv3fC3ty1ZkMDnPH93pyij9+Yi9+euxsFG75MlkzrqnzpH4D5OgrmVJ593s4kmg
-qXoTbx/F6XRQZv+4TQBMMm8RjwLnd5n8IATT2c+oWCCU2E4AjhCIf7tO/uThWuf0
-TFfvYNiDAb1qCIbeRjfkO86S/3nZ5VqAeJDb0kRSSMLr1C7F2uOPUl8HzAsTezyC
-XEQyNDeR4i31CAXLuKaQPn5ACf6wuhDXROARELtZ/RBR1/AamgQC8qyo/HRB97vt
-2hc5twECgYEAy7p+Kr+H0K/XmpKEP/q2RLYVyvNIDZ4llidh1ZnBngVXP4dl7pQJ
-9f8owU1pEUtsKJkb3EcX38Wpk4NLYt/9vu9rjhh+ElQzvYxqhlu6+jAmHiBlSsh1
-/19pJDWrxzJ3AFsXV9D+IbYDy6NmF/5+FD7YhjP/dM+ScL3djFmNFrECgYEAy4yt
-/hZ6W96dxOreT9jl/22n/ixr50khfUMfkl3zJ7/S3ZaiA7m1dmL50fQmZMXjqVb5
-sF616/oxoODsFm99hiduZ4SaOnDaAw2Ro53GUyNToAx1OhVk+vyxm+21rh5dzxYM
-Z9RTGiQRs+eQiGh1iZC9rPrIARAlez98BHEDd68CgYA+egirD2WVJ/fUnU4VWMuA
-st5oCMd19aPNMnKcULTBwx2Ii/tEeP29BOz4qsan2RtoL9wNZ3f41eM1K7R4s/xb
-C41OXFB9Snk7jc41OfhTNWTbJFAr6OHW2OmjgxoU0nMQFt9HvP3SVMFBN/DdNtxv
-VP6N2XBj4CwmivNgUS4lYQKBgQCD5nGJST+Y8LUDub69tyuzTXei+V4izfzpkumO
-i1rZ0y/tb4MlLt4sDQ8dwjxu6N0SCs5aP8VbWRF30sip8S1CFaMxaXgXjrF3cP+D
-KuYtUaMK/4enT93T1pOxG2Szo/HeE8eOMMR5GA5wqgm6mxYvQp/my8t3BOOE7iqL
-JkC8+QKBgAeSSNuGJ+P2YBMBUCqR5MTCtRPIX/LXIJTp1HwV4NivWQRdkO/HQSAF
-HYvbj/QgbslGZOV/ezKIcM1E/Aw/hZjYxBh3RaEOQwfqbhBQm8Vs0ZLIFBLbTCSt
-LC8WVR25e4P477bE5tUWolxjUt2V0W3RDoTfj5zqMiQ6GodnqIKd
------END RSA PRIVATE KEY-----

files/Ansible.vagrant/keys/gitolite

+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAuhz18vjPsOUd4XNLZJ3DtESA+vIIDmhJg5JVNx92PPWT7/z+
+5NDMIada0A1k8nwuPHOsgo5SV3cSh8Ekna/A7nY/Ipd6qwIeHmT7VgIBmzLNmOnn
+LGOmN/vRsjI1JkHdgy8l4ZdwY0anX3ghFOSFA5M13t5XlCJrxFt/9mhkD2e/XKm/
+iioZevGco8XVFI28bCV6dHpzzRiiHXJOnXzceaBvjo+8NKNLw7ERn1hly+6kNX+t
+gwL/cDZocYS37n2Rx2EUvim68FHkvweIoEeMkLf846ErHSEj6TVXQcbvg83IK2Fp
+Erzf2eJy3BN8kw506QCTVhVRZDGOi7wuEbhY8wIDAQABAoIBAQCJ6PnrYKnuJ+kb
+babZWPpy8ywsR/rmSirnXyDcJukjxMop1GxAu+P3sB5f+vzpnlFYpFKZr8KeY3KM
+u/dZDapGScMA7ASPAZO17Bg+JGByU5P8Ep8lynWaGHTLud6eicIN+nr0jpZOSkWu
+PcMtyyQxgP0zN8jn0RXQPAk3WyWCL5ex6VstEPrBA5xcnZUWXUCHKnc67fYEfPhh
+RJJoqNFaU12XbKaeI4rfcGEn+PMCKnhh1EywpDGWusgDpGmkfN34EP1YNV/i2vEa
+MsgG/1iJur/NjpjLb1GSxJ5RR6AZXTqu8Gcd/TWvDPcMePThv0rk6m6soFBZlYf3
+OC/SChURAoGBAOYR2gTus3CPTy9EnRQ0fIBEi2RTPI3CpiAsCqTaapo2s/+FKY2Y
+NociIP77+PmWJv3E+Tbh6TIaHEBdArElDlrc0sAKK6y91VmoHFkxv/OFkMezKkmC
+UGzOWjRyURJWL/tX5z84JRYSvQDINpiXUBXEEvB0XxG3/dBmprvJ9Sx5AoGBAM8W
+1uR3T4vWbOCYVDU+dQJgdzPsG/tmCNHmXzbxMh6m00hP0IopjtfQb4dXlXNPaEvb
+lKK/L5Ut7m5IpA10sTzY1rN/3ogH7jk3kiy9OzNMQo2zlexdHJvp/lFKLml6sypO
+BKKRuSSJN/ABl3/5VsMcp9KYACO2kQeWuIPOj33LAoGAEOu3MS2tHNYtaLiPJPFH
+RtfDuLk2duad+TfEAKPfuz/StTRB/hv3xrCH5Lj7cr/MVlWqTpMG55xr/3/XtteW
+2q/rABy/YZEEo/dtPlIeX/au00EmFwnyiE4U7E6MD+Eu3jl01H14nMr8A5a2DTrz
+tOYaznyAkXkKvc0O7jjIQ2ECgYEAnFD0In5A6CASDTJOleYwMnwYXnQB5zDsxWvs
+QS+tEmAAqdu9YRzfet4V4YZmBCVTZ7c2qeZAh42lJU/lrVaBFpni7pk9o1bBJiVh
+TC4GisEsl4OQTls2ZiYpVrj08Z+xr+Q2MXRn2UFOnPbGoc3XBO4Ta65apJqBPMYz
+PyLjQyMCgYAJeStyFb33pZ56ZF+YTRhu8nhTbo8KVekLoilYmFuO+q/CVTIlaSQU
+CI/Jtgv48ZSXRSKzHJZ8mQlEDCfwPhfeCazjtA6EWnGfCf14m03pO4Emn9bnkK4N
+LsJta7AJ8u1kq5wvyD0PlEDOsaUHmxZ6pYeHpgEL0DFOWgkU2h7Akw==
+-----END RSA PRIVATE KEY-----

host_vars/cgit → host_vars/gitolite

 tls_cert: files/Ansible.vagrant/certs/cgit
 tls_key: files/Ansible.vagrant/keys/cgit
+gitolite_public_key: '{{ lookup("file",  "/home/nimrod/.ssh/shore_rsa.pub") }}'

requirements.yml

 ---
-- src: https://www.shore.co.il/cgit/ansible-cgit
+- src: https://www.shore.co.il/cgit/ansible-apache
   scm: git
   path: roles/
-  name: cgit
+  name: apache
 - src: https://www.shore.co.il/cgit/ansible-rutorrent
   scm: git
   path: roles/
@@ -95,3 +95,7 @@
   scm: git
   path: roles/
   name: redis
+- src: https://www.shore.co.il/cgit/ansible-gitolite
+  scm: git
+  path: roles/
+  name: gitolite

site.yml

@@ -5,9 +5,9 @@
   - common
 
 - hosts:
-  - cgit
+  - gitolite
   roles:
-  - cgit
+  - gitolite
 
 - hosts:
   - mail