fix up some comments, improve EPEL installation

8 files changed, 65 insertions, 10 deletions

diff --git a/lamp_haproxy/roles/base-apache/tasks/main.yml b/lamp_haproxy/roles/base-apache/tasks/main.yml
index de7c5ab..4b5a2d6 100644
--- a/lamp_haproxy/roles/base-apache/tasks/main.yml
+++ b/lamp_haproxy/roles/base-apache/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# This playbook installs httpd
+# This role installs httpd
 
 - name: Install http and php etc
   yum: name=$item state=installed
diff --git a/lamp_haproxy/roles/common/files/RPM-GPG-KEY-EPEL-6 b/lamp_haproxy/roles/common/files/RPM-GPG-KEY-EPEL-6
new file mode 100644
index 0000000..7a20304
--- /dev/null
+++ b/lamp_haproxy/roles/common/files/RPM-GPG-KEY-EPEL-6
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEvSKUIBEADLGnUj24ZVKW7liFN/JA5CgtzlNnKs7sBg7fVbNWryiE3URbn1
+JXvrdwHtkKyY96/ifZ1Ld3lE2gOF61bGZ2CWwJNee76Sp9Z+isP8RQXbG5jwj/4B
+M9HK7phktqFVJ8VbY2jfTjcfxRvGM8YBwXF8hx0CDZURAjvf1xRSQJ7iAo58qcHn
+XtxOAvQmAbR9z6Q/h/D+Y/PhoIJp1OV4VNHCbCs9M7HUVBpgC53PDcTUQuwcgeY6
+pQgo9eT1eLNSZVrJ5Bctivl1UcD6P6CIGkkeT2gNhqindRPngUXGXW7Qzoefe+fV
+QqJSm7Tq2q9oqVZ46J964waCRItRySpuW5dxZO34WM6wsw2BP2MlACbH4l3luqtp
+Xo3Bvfnk+HAFH3HcMuwdaulxv7zYKXCfNoSfgrpEfo2Ex4Im/I3WdtwME/Gbnwdq
+3VJzgAxLVFhczDHwNkjmIdPAlNJ9/ixRjip4dgZtW8VcBCrNoL+LhDrIfjvnLdRu
+vBHy9P3sCF7FZycaHlMWP6RiLtHnEMGcbZ8QpQHi2dReU1wyr9QgguGU+jqSXYar
+1yEcsdRGasppNIZ8+Qawbm/a4doT10TEtPArhSoHlwbvqTDYjtfV92lC/2iwgO6g
+YgG9XrO4V8dV39Ffm7oLFfvTbg5mv4Q/E6AWo/gkjmtxkculbyAvjFtYAQARAQAB
+tCFFUEVMICg2KSA8ZXBlbEBmZWRvcmFwcm9qZWN0Lm9yZz6JAjYEEwECACAFAkvS
+KUICGw8GCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRA7Sd8qBgi4lR/GD/wLGPv9
+qO39eyb9NlrwfKdUEo1tHxKdrhNz+XYrO4yVDTBZRPSuvL2yaoeSIhQOKhNPfEgT
+9mdsbsgcfmoHxmGVcn+lbheWsSvcgrXuz0gLt8TGGKGGROAoLXpuUsb1HNtKEOwP
+Q4z1uQ2nOz5hLRyDOV0I2LwYV8BjGIjBKUMFEUxFTsL7XOZkrAg/WbTH2PW3hrfS
+WtcRA7EYonI3B80d39ffws7SmyKbS5PmZjqOPuTvV2F0tMhKIhncBwoojWZPExft
+HpKhzKVh8fdDO/3P1y1Fk3Cin8UbCO9MWMFNR27fVzCANlEPljsHA+3Ez4F7uboF
+p0OOEov4Yyi4BEbgqZnthTG4ub9nyiupIZ3ckPHr3nVcDUGcL6lQD/nkmNVIeLYP
+x1uHPOSlWfuojAYgzRH6LL7Idg4FHHBA0to7FW8dQXFIOyNiJFAOT2j8P5+tVdq8
+wB0PDSH8yRpn4HdJ9RYquau4OkjluxOWf0uRaS//SUcCZh+1/KBEOmcvBHYRZA5J
+l/nakCgxGb2paQOzqqpOcHKvlyLuzO5uybMXaipLExTGJXBlXrbbASfXa/yGYSAG
+iVrGz9CE6676dMlm8F+s3XXE13QZrXmjloc6jwOljnfAkjTGXjiB7OULESed96MR
+XtfLk0W5Ab9pd7tKDR6QHI7rgHXfCopRnZ2VVQ==
+=V/6I
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/lamp_haproxy/roles/common/files/epel.repo b/lamp_haproxy/roles/common/files/epel.repo
new file mode 100644
index 0000000..0160dfe
--- /dev/null
+++ b/lamp_haproxy/roles/common/files/epel.repo
@@ -0,0 +1,26 @@
+[epel]
+name=Extra Packages for Enterprise Linux 6 - $basearch
+#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch
+failovermethod=priority
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+
+[epel-debuginfo]
+name=Extra Packages for Enterprise Linux 6 - $basearch - Debug
+#baseurl=http://download.fedoraproject.org/pub/epel/6/$basearch/debug
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-6&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+gpgcheck=1
+
+[epel-source]
+name=Extra Packages for Enterprise Linux 6 - $basearch - Source
+#baseurl=http://download.fedoraproject.org/pub/epel/6/SRPMS
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=epel-source-6&arch=$basearch
+failovermethod=priority
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6
+gpgcheck=1
diff --git a/lamp_haproxy/roles/common/tasks/main.yml b/lamp_haproxy/roles/common/tasks/main.yml
index ab99de8..841fc0c 100644
--- a/lamp_haproxy/roles/common/tasks/main.yml
+++ b/lamp_haproxy/roles/common/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
-# This playbook contains common plays that will run on all nodes.
+# This role contains common plays that will run on all nodes.
 
-- name: Download the EPEL repository RPM
-  get_url: url=http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm dest=/tmp/ force=yes
+- name: Create the repository for EPEL
+  copy: src=epel.repo dest=/etc/yum.repos.d/epel.repo
 
-- name: Install EPEL RPM
-  yum: name=/tmp/epel-release-6-8.noarch.rpm state=installed
+- name: Create the GPG key for EPEL
+  copy: src=RPM-GPG-KEY-EPEL-6 dest=/etc/pki/rpm-gpg
 
 - name: install some useful nagios plugins 
   yum: name=$item state=present
diff --git a/lamp_haproxy/roles/db/tasks/main.yml b/lamp_haproxy/roles/db/tasks/main.yml
index cb3db35..37772a4 100644
--- a/lamp_haproxy/roles/db/tasks/main.yml
+++ b/lamp_haproxy/roles/db/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# This playbook will install MySQL and create db user and give permissions.
+# This role will install MySQL and create db user and give permissions.
 
 - name: Install Mysql package
   yum: pkg=$item state=installed
diff --git a/lamp_haproxy/roles/haproxy/tasks/main.yml b/lamp_haproxy/roles/haproxy/tasks/main.yml
index a9c0826..9f3cf2b 100644
--- a/lamp_haproxy/roles/haproxy/tasks/main.yml
+++ b/lamp_haproxy/roles/haproxy/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# This playbook installs HAProxy and configures it.
+# This role installs HAProxy and configures it.
 
 - name: Download and install haproxy and socat
   yum: name=$item state=installed
diff --git a/lamp_haproxy/roles/nagios/handlers/main.yml b/lamp_haproxy/roles/nagios/handlers/main.yml
index a09e099..87f6fde 100644
--- a/lamp_haproxy/roles/nagios/handlers/main.yml
+++ b/lamp_haproxy/roles/nagios/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
-# handlers for icinga
+# handlers for nagios 
 - name: restart httpd
   service: name=httpd state=restarted
 
diff --git a/lamp_haproxy/roles/nagios/tasks/main.yml b/lamp_haproxy/roles/nagios/tasks/main.yml
index 263f54a..5216708 100644
--- a/lamp_haproxy/roles/nagios/tasks/main.yml
+++ b/lamp_haproxy/roles/nagios/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# This playbook will install nagios
+# This will install nagios
 
 - name: install nagios 
   yum: pkg=$item state=installed