diff --git a/ansible/roles/blocks/nginx-proxy/defaults/main.yml b/ansible/roles/blocks/nginx-proxy/defaults/main.yml deleted file mode 100644 index c009a4a..0000000 --- a/ansible/roles/blocks/nginx-proxy/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -nginx_proxy_name: '' -nginx_proxy_dir: '/var/www/{{ nginx_proxy_name }}' -nginx_proxy_web_root: '{{ nginx_proxy_dir }}/current' -nginx_proxy_template: site.conf.j2 diff --git a/ansible/roles/blocks/nginx-proxy/tasks/main.yml b/ansible/roles/blocks/nginx-proxy/tasks/main.yml deleted file mode 100644 index 6c59b84..0000000 --- a/ansible/roles/blocks/nginx-proxy/tasks/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: "Create nginx config for {{ nginx_proxy_name }} from {{ nginx_proxy_template }}." - template: - src: '{{ nginx_proxy_template }}' - dest: "/etc/nginx/sites-enabled/{{ nginx_proxy_name }}.conf" - notify: restart nginx - tags: - - webserver - -- name: "Create root folder for {{ nginx_proxy_name }}." - file: - path: "{{ nginx_proxy_dir }}" - state: directory - owner: "{{ deploy_user }}" - group: www-data - recurse: yes - notify: restart nginx - tags: - - webserver diff --git a/ansible/roles/blocks/nginx-proxy/templates/site.conf.j2 b/ansible/roles/blocks/nginx-proxy/templates/site.conf.j2 deleted file mode 100755 index 20e60bf..0000000 --- a/ansible/roles/blocks/nginx-proxy/templates/site.conf.j2 +++ /dev/null @@ -1,15 +0,0 @@ -server { - server_name www.{{ nginx_proxy_domain }}; - return 301 $scheme://{{ nginx_proxy_domain }}$request_uri; -} - -server { - listen 80; - server_name {{ nginx_proxy_domain }}; - - location / { - root {{ nginx_proxy_web_root }}; - index index.html; - try_files $uri $uri/ =404; - } -} diff --git a/ansible/roles/blocks/php-app/defaults/main.yml b/ansible/roles/blocks/php-app/defaults/main.yml deleted file mode 100644 index 24c40f7..0000000 --- a/ansible/roles/blocks/php-app/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -php_app_name: '' -php_app_user: '' -php_app_group: '' -php_app_directory: '' -php_app_web_root: '' -php_app_nginx_config: '' -php_app_php_version: '' -php_app_fpm_pool_name: '{{ php_app_name }}' -php_app_fpm_listen: '127.0.0.1:9001' -php_app_envs: {} diff --git a/ansible/roles/blocks/php-app/tasks/main.yml b/ansible/roles/blocks/php-app/tasks/main.yml deleted file mode 100644 index e48571c..0000000 --- a/ansible/roles/blocks/php-app/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: 'Check app requirements for {{ php_app_name }}.' - fail: - msg: You must set app name. - when: not php_app_name - -- name: 'Create web directory for {{ php_app_name }}.' - file: - state: directory - path: '{{ php_app_directory }}' - owner: '{{ php_app_user }}' - group: '{{ php_app_group }}' - recurse: yes - notify: restart nginx - -- name: 'Create nginx config for {{ php_app_name }}.' - template: - src: '{{ php_app_nginx_config }}' - dest: '/etc/nginx/sites-enabled/{{ php_app_name }}.conf' - notify: restart nginx - -- name: 'Creates php-fpm pool config for {{ php_app_name }}.' - template: - src: fpm-pool.conf.j2 - dest: '/etc/php/{{ php_app_php_version }}/fpm/pool.d/{{ php_app_name }}.conf' - notify: restart php-fpm diff --git a/ansible/roles/blocks/php-app/templates/fpm-pool.conf.j2 b/ansible/roles/blocks/php-app/templates/fpm-pool.conf.j2 deleted file mode 100644 index 49fb30e..0000000 --- a/ansible/roles/blocks/php-app/templates/fpm-pool.conf.j2 +++ /dev/null @@ -1,28 +0,0 @@ -[{{ php_app_fpm_pool_name }}] - -listen = {{ php_app_fpm_listen }} -listen.allowed_clients = 127.0.0.1 -listen.backlog = -1 - -user = {{ php_app_user }} -group = {{ php_app_group }} - -; request_slowlog_timeout = 5s -; slowlog = /var/log/php-fpm/slowlog-blog.log - -pm = dynamic -pm.max_children = 4 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 -pm.max_requests = 200 -pm.status_path = /status - -request_terminate_timeout = 120s -rlimit_files = 131072 -rlimit_core = unlimited -catch_workers_output = yes - -{% for name, value in php_app_envs.iteritems() %} -env[{{ name }}]={{ value }} -{% endfor %} diff --git a/ansible/roles/blocks/static-site/defaults/main.yml b/ansible/roles/blocks/static-site/defaults/main.yml deleted file mode 100644 index 22c51e4..0000000 --- a/ansible/roles/blocks/static-site/defaults/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -static_site_name: '' -static_site_dir: '/var/www/{{ static_site_name }}' -static_site_web_root: '{{ static_site_dir }}/current' -static_site_template: site.conf.j2 diff --git a/ansible/roles/blocks/static-site/tasks/main.yml b/ansible/roles/blocks/static-site/tasks/main.yml deleted file mode 100644 index f4aa7d2..0000000 --- a/ansible/roles/blocks/static-site/tasks/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -- name: "Create nginx config for {{ static_site_name }} from {{ static_site_template }}." - template: - src: '{{ static_site_template }}' - dest: "/etc/nginx/sites-enabled/{{ static_site_name }}.conf" - notify: restart nginx - tags: - - webserver - -- name: "Create root folder for {{ static_site_name }}." - file: - path: "{{ static_site_dir }}" - state: directory - owner: "{{ deploy_user }}" - group: www-data - recurse: yes - notify: restart nginx - tags: - - webserver diff --git a/ansible/roles/blocks/static-site/templates/site.conf.j2 b/ansible/roles/blocks/static-site/templates/site.conf.j2 deleted file mode 100755 index 36505cf..0000000 --- a/ansible/roles/blocks/static-site/templates/site.conf.j2 +++ /dev/null @@ -1,15 +0,0 @@ -server { - server_name www.{{ static_site_domain }}; - return 301 $scheme://{{ static_site_domain }}$request_uri; -} - -server { - listen 80; - server_name {{ static_site_domain }}; - - location / { - root {{ static_site_web_root }}; - index index.html; - try_files $uri $uri/ =404; - } -}