diff --git a/1/play.yml b/1/play.yml index 341e692..08b6850 100644 --- a/1/play.yml +++ b/1/play.yml @@ -2,6 +2,7 @@ become: true vars: domain: zz777.ru + ssl: false roles: - nginx - php diff --git a/1/roles/nginx/tasks/main.yml b/1/roles/nginx/tasks/main.yml index 0106e79..08991b1 100644 --- a/1/roles/nginx/tasks/main.yml +++ b/1/roles/nginx/tasks/main.yml @@ -6,4 +6,5 @@ - include_tasks: configure.yml -- include_tasks: certbot.yml \ No newline at end of file +- include_tasks: certbot.yml + when: ssl \ No newline at end of file diff --git a/1/roles/webapps/tasks/main.yml b/1/roles/webapps/tasks/main.yml index c950b5a..40c08e0 100644 --- a/1/roles/webapps/tasks/main.yml +++ b/1/roles/webapps/tasks/main.yml @@ -4,15 +4,4 @@ name: unzip state: latest -- name: Download and unpack phpmyadmin - ansible.builtin.unarchive: - src: https://files.phpmyadmin.net/phpMyAdmin/5.1.0/phpMyAdmin-5.1.0-all-languages.zip - dest: /var/www/pma - remote_src: yes - owner: www-data - -- name: move pma to pma dir - copy: - src: /var/www/pma/phpMyAdmin-5.1.0-all-languages/ - dest: /var/www/pma/ - remote_src: True \ No newline at end of file +- include_tasks: pma.yml \ No newline at end of file diff --git a/1/roles/webapps/tasks/pma.yml b/1/roles/webapps/tasks/pma.yml new file mode 100644 index 0000000..653e734 --- /dev/null +++ b/1/roles/webapps/tasks/pma.yml @@ -0,0 +1,14 @@ +--- + +- name: Download and unpack phpmyadmin + ansible.builtin.unarchive: + src: https://files.phpmyadmin.net/phpMyAdmin/5.1.0/phpMyAdmin-5.1.0-all-languages.zip + dest: /var/www/pma + remote_src: yes + owner: www-data + +- name: move pma to pma dir + copy: + src: /var/www/pma/phpMyAdmin-5.1.0-all-languages/ + dest: /var/www/pma/ + remote_src: True \ No newline at end of file