diff options
| author | Dave Johnson <dave@ansibleworks.com> | 2016-07-21 17:30:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 17:30:02 +0300 |
| commit | efa1eba776d955c250d57c70ee4bf3fb1b8647ae (patch) | |
| tree | 6c97c81f9cece3bc97da0da1432e08dd3ace5245 | |
| parent | 37d447dec33bdd00b3c666dab1bcfe357fed8817 (diff) | |
| parent | 6a89842a9844952c2bb19fddf357c1f7b111e5dc (diff) | |
Merge pull request #146 from boyvanduuren/lamp_simple_rhel7
Fixes (#145) missing package + package install order
| -rw-r--r-- | lamp_simple_rhel7/roles/common/tasks/main.yml | 7 | ||||
| -rw-r--r-- | lamp_simple_rhel7/roles/db/tasks/main.yml | 5 | ||||
| -rw-r--r-- | lamp_simple_rhel7/roles/web/tasks/install_httpd.yml | 11 |
3 files changed, 18 insertions, 5 deletions
diff --git a/lamp_simple_rhel7/roles/common/tasks/main.yml b/lamp_simple_rhel7/roles/common/tasks/main.yml index c73908d..16c8085 100644 --- a/lamp_simple_rhel7/roles/common/tasks/main.yml +++ b/lamp_simple_rhel7/roles/common/tasks/main.yml @@ -5,6 +5,13 @@ yum: name=ntp state=present tags: ntp +- name: Install common dependencies + yum: name={{ item }} state=installed + with_items: + - libselinux-python + - libsemanage-python + - firewalld + - name: Configure ntp file template: src=ntp.conf.j2 dest=/etc/ntp.conf tags: ntp diff --git a/lamp_simple_rhel7/roles/db/tasks/main.yml b/lamp_simple_rhel7/roles/db/tasks/main.yml index b66a28a..aa4ae5f 100644 --- a/lamp_simple_rhel7/roles/db/tasks/main.yml +++ b/lamp_simple_rhel7/roles/db/tasks/main.yml @@ -6,8 +6,6 @@ with_items: - mariadb-server - MySQL-python - - libselinux-python - - libsemanage-python - name: Configure SELinux to start mysql on any port seboolean: name=mysql_connect_any state=true persistent=yes @@ -26,6 +24,9 @@ - name: Start MariaDB Service service: name=mariadb state=started enabled=yes +- name: Start firewalld + service: name=firewalld state=started enabled=yes + - name: insert firewalld rule firewalld: port={{ mysql_port }}/tcp permanent=true state=enabled immediate=yes diff --git a/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml b/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml index a0fe65f..ede2ea8 100644 --- a/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml +++ b/lamp_simple_rhel7/roles/web/tasks/install_httpd.yml @@ -1,15 +1,20 @@ --- # These tasks install http and the php modules. -- name: Install http and php etc +- name: Install httpd and php yum: name={{ item }} state=present with_items: - httpd - php - php-mysql + +- name: Install web role specific dependencies + yum: name={{ item }} state=installed + with_items: - git - - libsemanage-python - - libselinux-python + +- name: Start firewalld + service: name=firewalld state=started enabled=yes - name: insert firewalld rule for httpd firewalld: port={{ httpd_port }}/tcp permanent=true state=enabled immediate=yes |