From f978320d8658c9539ed6e4232b215648ea4ac0ef Mon Sep 17 00:00:00 2001
From: Author Name <lfrodrigues@gmail.com>
Date: Mon, 1 Jan 2018 18:48:13 +0000
Subject: [PATCH] Updated version, ngx_pagespeed urls and added http v2 module

---
 defaults/main.yml                |  6 ++++--
 tasks/modules.yml                |  3 +++
 tasks/modules/http_v2_module.yml |  4 ++++
 tasks/modules/ngx_pagespeed.yml  | 16 ++++++++--------
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 tasks/modules/http_v2_module.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index b47ab55..41dfbb4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -81,9 +81,10 @@ nginx_source_modules_included:
   ipv6_module: "--with-ipv6"
   http_real_ip_module: "--with-http_realip_module"
   http_spdy_module: "--with-http_spdy_module"
+  http_v2_module: "--with-http_v2_module"
   http_perl_module: "--with-http_perl_module"
   naxsi_module: "--add-module=/tmp/naxsi-{{nginx_naxsi_version}}/naxsi_src"
-  ngx_pagespeed: "--add-module=/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
+  ngx_pagespeed: "--add-module=/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}"
   http_geoip_module: "--with-http_geoip_module"
 
 nginx_source_modules_excluded:
@@ -167,7 +168,8 @@ nginx_naxsi_version: "0.53"
 nginx_naxsi_url: "https://github.com/nbs-system/naxsi/archive/{{nginx_naxsi_version}}.tar.gz"
 
 # ngx_pagespeed_module configuration
-nginx_ngx_pagespeed_version: 1.9.32.4
+nginx_ngx_pagespeed_version: 1.12.34.2-stable
+nginx_ngx_pagespeed_psol_version: 1.12.34.2-x64
 
 # OpenSSL configuration
 openssl_version: "1.0.2h"
diff --git a/tasks/modules.yml b/tasks/modules.yml
index a48da33..0af4c20 100644
--- a/tasks/modules.yml
+++ b/tasks/modules.yml
@@ -33,6 +33,9 @@
 - include: modules/http_spdy_module.yml
   when: nginx_source_modules_included.http_spdy_module is defined
 
+- include: modules/http_v2_module.yml
+  when: nginx_source_modules_included.http_v2_module is defined
+
 - include: modules/naxsi_module.yml
   when: nginx_source_modules_included.naxsi_module is defined
 
diff --git a/tasks/modules/http_v2_module.yml b/tasks/modules/http_v2_module.yml
new file mode 100644
index 0000000..8908412
--- /dev/null
+++ b/tasks/modules/http_v2_module.yml
@@ -0,0 +1,4 @@
+# file: nginx/tasks/modules/http_v2_module.yml
+# configure flag: --with-http_v2_module
+
+# no contents
diff --git a/tasks/modules/ngx_pagespeed.yml b/tasks/modules/ngx_pagespeed.yml
index e72f0e7..c113113 100644
--- a/tasks/modules/ngx_pagespeed.yml
+++ b/tasks/modules/ngx_pagespeed.yml
@@ -1,5 +1,5 @@
 # file: nginx/tasks/modules/ngx_pagespeed.yml
-# configure flag: --add-module=/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta
+# configure flag: --add-module=/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}
 
 - name: Nginx | Modules | Make sure the dependences are installed
   apt:
@@ -11,22 +11,22 @@
 
 - name: Nginx | Modules | Download the ngx_pagespeed source
   get_url:
-    url: "https://github.com/pagespeed/ngx_pagespeed/archive/release-{{nginx_ngx_pagespeed_version}}-beta.tar.gz"
+    url: "https://github.com/apache/incubator-pagespeed-ngx/archive/v{{nginx_ngx_pagespeed_version}}.tar.gz"
     dest: "/tmp/ngx_pagespeed_module.tar.gz"
 
 - name: Nginx | Modules | Unpack the ngx_pagespeed source
   command: tar -xvzf /tmp/ngx_pagespeed_module.tar.gz
   args:
     chdir: /tmp
-    creates: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
+    creates: "/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}"
 
 - 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-release-{{nginx_ngx_pagespeed_version}}-beta/psol.tar.gz"
+    url: "https://dl.google.com/dl/page-speed/psol/{{nginx_ngx_pagespeed_psol_version}}.tar.gz"
+    dest: "/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}/psol.tar.gz"
 
 - name: Nginx | Modules | Unpack the psol source
-  command: "tar -xvzf /tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta/psol.tar.gz"
+  command: "tar -xvzf /tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}/psol.tar.gz"
   args:
-    chdir: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta"
-    creates: "/tmp/ngx_pagespeed-release-{{nginx_ngx_pagespeed_version}}-beta/psol"
+    chdir: "/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}"
+    creates: "/tmp/incubator-pagespeed-ngx-{{nginx_ngx_pagespeed_version}}/psol"