Merge pull request #38 from ANXS/farridav/update_module_on_change

Update modules when they have changed

README.md

@@ -88,17 +88,17 @@ nginx_source_modules_included:
   http_stub_status_module: "--with-http_stub_status_module"
   http_ssl_module: "--with-http_ssl_module"
   http_gzip_static_module: "--with-http_gzip_static_module"
-  upload_progress_module: "--add-module=/tmp/nginx_upload_progress"
-  headers_more_module: "--add-module=/tmp/nginx_headers_more"
-  http_auth_request_module: "--add-module=/tmp/nginx_auth_request"
-  http_echo_module: "--add-module=/tmp/nginx_echo"
+  upload_progress_module: "--add-module=/tmp/nginx-upload-progress-module-{{nginx_upload_progress_version}}"
+  headers_more_module: "--add-module=/tmp/headers-more-nginx-module-{{nginx_headers_more_version}}"
+  http_auth_request_module: "--add-module=/tmp/ngx_http_auth_request_module-{{nginx_auth_request_release}}"
+  http_echo_module: "--add-module=/tmp/echo-nginx-module-{{nginx_echo_version}}"
   google_perftools_module: "--with-google_perftools_module"
   ipv6_module: "--with-ipv6"
   http_real_ip_module: "--with-http_realip_module"
   http_spdy_module: "--with-http_spdy_module"
   http_perl_module: "--with-http_perl_module"
-  naxsi_module: "--add-module=/tmp/nginx_naxsi"
-  ngx_pagespeed: "--add-module=/tmp/ngx_pagespeed"
+  naxsi_module: "--add-module=/tmp/naxsi-{{nginx_naxsi_version}}/naxsi_src"
+  ngx_pagespeed: "--add-module=/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
 ```
 
 ##### Sites

defaults/main.yml

@@ -72,17 +72,17 @@ nginx_source_modules_included:
   http_ssl_module: "--with-http_ssl_module"
   openssl: "--with-openssl=/tmp/openssl-{{ openssl_version }}"
   http_gzip_static_module: "--with-http_gzip_static_module"
-  upload_progress_module: "--add-module=/tmp/nginx_upload_progress"
-  headers_more_module: "--add-module=/tmp/nginx_headers_more"
-  http_auth_request_module: "--add-module=/tmp/nginx_auth_request"
-  http_echo_module: "--add-module=/tmp/nginx_echo"
+  upload_progress_module: "--add-module=/tmp/nginx-upload-progress-module-{{nginx_upload_progress_version}}"
+  headers_more_module: "--add-module=/tmp/headers-more-nginx-module-{{nginx_headers_more_version}}"
+  http_auth_request_module: "--add-module=/tmp/ngx_http_auth_request_module-{{nginx_auth_request_release}}"
+  http_echo_module: "--add-module=/tmp/echo-nginx-module-{{nginx_echo_version}}"
   google_perftools_module: "--with-google_perftools_module"
   ipv6_module: "--with-ipv6"
   http_real_ip_module: "--with-http_realip_module"
   http_spdy_module: "--with-http_spdy_module"
   http_perl_module: "--with-http_perl_module"
-  naxsi_module: "--add-module=/tmp/nginx_naxsi"
-  ngx_pagespeed: "--add-module=/tmp/ngx_pagespeed"
+  naxsi_module: "--add-module=/tmp/naxsi-{{nginx_naxsi_version}}/naxsi_src"
+  ngx_pagespeed: "--add-module=/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
 
 nginx_source_modules_excluded:
   - mail_pop3_module

tasks/modules/headers_more_module.yml

@@ -7,7 +7,5 @@
     dest: "/tmp/nginx-headers-more-module-{{nginx_headers_more_version}}.tar.gz"
 
 - name: Nginx | Modules | Unpack the headers_more_module source
-  command: tar -xvzf /tmp/nginx-headers-more-module-{{nginx_headers_more_version}}.tar.gz chdir=/tmp creates=/tmp/headers-more-nginx-module-{{nginx_headers_more_version}}
-
-- name: Nginx | Modules | Copy the headers_more_module source folder
-  command: sudo cp -R /tmp/headers-more-nginx-module-{{nginx_headers_more_version}} /tmp/nginx_headers_more creates=/tmp/nginx_headers_more
+  command: tar -xvzf /tmp/nginx-headers-more-module-{{nginx_headers_more_version}}.tar.gz
+    chdir=/tmp creates=/tmp/headers-more-nginx-module-{{nginx_headers_more_version}}

tasks/modules/http_auth_request_module.yml

@@ -8,7 +8,3 @@
 
 - name: Nginx | Modules | Unpack the http_auth_request_module source
   command: tar -xvzf /tmp/nginx-auth-request-module.tar.gz chdir=/tmp creates=/tmp/ngx_http_auth_request_module-{{nginx_auth_request_release}}
-
-- name: Nginx | Modules | Copy the http_auth_request_module source folder
-  command: sudo cp -R /tmp/ngx_http_auth_request_module-{{nginx_auth_request_release}} /tmp/nginx_auth_request creates=/tmp/nginx_auth_request
-

tasks/modules/http_echo_module.yml

@@ -8,6 +8,3 @@
 
 - name: Nginx | Modules | Unpack the http_echo_module source
   command: tar -xvzf /tmp/nginx-echo-module.tar.gz chdir=/tmp creates=/tmp/echo-nginx-module-{{nginx_echo_version}}
-
-- name: Nginx | Modules | Copy the http_echo_module source folder
-  command: sudo cp -R /tmp/echo-nginx-module-{{nginx_echo_version}} /tmp/nginx_echo creates=/tmp/nginx_echo

tasks/modules/naxsi_module.yml

@@ -1,5 +1,5 @@
 # file: roles/nginx/tasks/modules/naxsi_module.yml
-# configure flag: --add-module=/tmp/nginx_naxsi
+# configure flag: --add-module=/tmp/naxsi-{{nginx_naxsi_version}}/naxsi_src
 
 - name: Nginx | Modules | Download the naxsi_module source
   get_url:
@@ -9,9 +9,6 @@
 - name: Nginx | Modules | Unpack the naxsi_module source
   command: tar -xvzf /tmp/nginx-naxsi-module.tar.gz chdir=/tmp creates=/tmp/naxsi-{{nginx_naxsi_version}}
 
-- name: Nginx | Modules | Copy the naxsi_module source folder
-  command: sudo cp -R /tmp/naxsi-{{nginx_naxsi_version}}/naxsi_src /tmp/nginx_naxsi creates=/tmp/nginx_naxsi
-
 - name: Nginx | Modules | Make sure the naxsi_module configuration is up to date
   copy:
     src: ../../files/naxsi_core.rules

tasks/modules/ngx_pagespeed.yml

@@ -1,5 +1,5 @@
 # file: nginx/tasks/modules/ngx_pagespeed.yml
-# configure flag: --add-module=/tmp/ngx_pagespeed
+# configure flag: --add-module=/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta
 
 - name: Nginx | Modules | Make sure the dependences are installed
   apt:
@@ -13,25 +13,20 @@
   get_url:
     url: "https://github.com/pagespeed/ngx_pagespeed/archive/release-{{nginx_ngx_pagespeed_version}}-beta.tar.gz"
     dest: "/tmp/ngx_pagespeed_module.tar.gz"
-  register: ngx_pagespeed_download
 
 - name: Nginx | Modules | Unpack the ngx_pagespeed source
   command: tar -xvzf /tmp/ngx_pagespeed_module.tar.gz
   args:
     chdir: /tmp
-    creates: "ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
-
-- name: Nginx | Modules | Copy the ngx_pagespeed source folder
-  command: sudo cp -R /tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta /tmp/ngx_pagespeed
-  when: ngx_pagespeed_download.changed
+    creates: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
 
 - name: Nginx | Modules | Download the psol source
   get_url:
     url: "https://dl.google.com/dl/page-speed/psol/{{nginx_ngx_pagespeed_version}}.tar.gz"
-    dest: "/tmp/ngx_pagespeed/psol.tar.gz"
+    dest: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta/psol.tar.gz"
 
 - name: Nginx | Modules | Unpack the psol source
-  command: "tar -xvzf /tmp/ngx_pagespeed/psol.tar.gz"
+  command: "tar -xvzf /tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta/psol.tar.gz"
   args:
-    chdir: "/tmp/ngx_pagespeed"
-    creates: "/tmp/ngx_pagespeed/psol"
+    chdir: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
+    creates: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta/psol"

tasks/modules/upload_progress_module.yml

@@ -11,9 +11,6 @@
 - name: Nginx | Modules | Unpack the upload_progress_module source
   command: tar -xvzf /tmp/nginx-upload-progress-module-{{nginx_upload_progress_version}}.tar.gz chdir=/tmp creates=/tmp/nginx-upload-progress-module-{{nginx_upload_progress_version}}
 
-- name: Nginx | Modules | Copy the upload_progress_module source folder
-  command: sudo cp -R /tmp/nginx-upload-progress-module-{{nginx_upload_progress_version}} /tmp/nginx_upload_progress creates=/tmp/nginx_upload_progress
-
 - name: Nginx | Modules | Make sure the upload_progress_module configuration is updated
   template:
     src: ../../templates/modules/upload_progress.j2