diff --git a/README.md b/README.md index d7a1678..a261767 100644 --- a/README.md +++ b/README.md @@ -105,7 +105,7 @@ nginx_source_modules_included: http_spdy_module: "--with-http_spdy_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-release-{{nginx_ngx_pagespeed_version}}-beta" http_geoip_module: "--with-http_geoip_module" ``` diff --git a/defaults/main.yml b/defaults/main.yml index bf88193..255f430 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,8 @@ --- # file: nginx/defaults/main.yml -nginx_install_method: "package" + +nginx_install_method: "{{ 'package' if ansible_distribution_version == '22.04' else 'source' }}" nginx_source_version: "1.25.2" nginx: "nginx" ubuntu_release: "focal" @@ -88,7 +89,7 @@ nginx_source_modules_included: http_spdy_module: "--with-http_spdy_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-release-{{nginx_ngx_pagespeed_version}}-beta" http_geoip_module: "--with-http_geoip_module" nginx_source_modules_excluded: @@ -147,8 +148,8 @@ nginx_upload_progress_url: "https://github.com/masterzen/nginx-upload-progress-m # headers_more_module configuration -nginx_headers_more_version: "0.261" -nginx_headers_more_url: "https://github.com/agentzh/headers-more-nginx-module/archive/v{{nginx_headers_more_version}}.tar.gz" +nginx_headers_more_version: "0.26" +nginx_headers_more_url: "https://github.com/openresty/headers-more-nginx-module/archive/refs/tags/v{{nginx_headers_more_version}}.tar.gz" # http_auth_request_module configuration @@ -158,7 +159,7 @@ nginx_auth_request_url: "http://mdounin.ru/hg/ngx_http_auth_request_module/archi # http_echo_module configuration nginx_echo_version: "0.58" -nginx_echo_url: "https://github.com/agentzh/echo-nginx-module/archive/v{{nginx_echo_version}}.tar.gz" +nginx_echo_url: "https://github.com/openresty/echo-nginx-module/archive/refs/tags/v{{nginx_echo_version}}.tar.gz" # http_realip_module configuration diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 1d7ea4d..4874ccc 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -11,7 +11,6 @@ - key.pem roles: - role: ansible-nginx - nginx_install_method: "package" nginx_ssl_dir: "{{ nginx_dir }}/ssl/tests/{{ site.server.server_name }}" nginx_access_logs: - name: "example_com_access_format" diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 07031eb..ea75345 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -15,7 +15,7 @@ platforms: privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" @@ -24,16 +24,17 @@ platforms: privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" - name: nginx-ubuntu-22.04 - image: geerlingguy/docker-ubuntu2204-ansible:latest + image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible:latest privileged: true command: /sbin/init volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw + cgroupns_mode: host env: LC_ALL: "C.UTF-8" LANG: "C.UTF-8" diff --git a/molecule/install-only/converge.yml b/molecule/install-only/converge.yml index d3a4971..c4b6e98 100644 --- a/molecule/install-only/converge.yml +++ b/molecule/install-only/converge.yml @@ -11,7 +11,6 @@ - key.pem roles: - role: ansible-nginx - nginx_install_method: "package" nginx_ssl_dir: "{{ nginx_dir }}/ssl/tests/{{ site.server.server_name }}" nginx_install_only: true nginx_access_logs: diff --git a/molecule/install-only/molecule.yml b/molecule/install-only/molecule.yml index c285ab7..cc6f4e5 100644 --- a/molecule/install-only/molecule.yml +++ b/molecule/install-only/molecule.yml @@ -11,6 +11,8 @@ platforms: - name: ubuntu-16.04 image: solita/ubuntu-systemd:16.04 privileged: true + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:rw command: /sbin/init provisioner: name: ansible diff --git a/tasks/modules/http_spdy_module.yml b/tasks/modules/http_spdy_module.yml index 7fc1e55..ec49400 100644 --- a/tasks/modules/http_spdy_module.yml +++ b/tasks/modules/http_spdy_module.yml @@ -1,3 +1,4 @@ +--- # file: nginx/tasks/modules/http_spdy_module.yml # configure flag: --with-http_spdy_module diff --git a/tasks/modules/ngx_pagespeed.yml b/tasks/modules/ngx_pagespeed.yml index 1e34025..09ddd78 100644 --- a/tasks/modules/ngx_pagespeed.yml +++ b/tasks/modules/ngx_pagespeed.yml @@ -1,6 +1,6 @@ --- # 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-release-{{nginx_ngx_pagespeed_version}}-beta - name: Nginx | Modules | Make sure the dependences are installed apt: @@ -19,15 +19,15 @@ 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-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-release-{{nginx_ngx_pagespeed_version}}-beta/psol.tar.gz" + dest: "/tmp/incubator-pagespeed-ngx-release-{{nginx_ngx_pagespeed_version}}-beta/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-release-{{nginx_ngx_pagespeed_version}}-beta/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-release-{{nginx_ngx_pagespeed_version}}-beta" + creates: "/tmp/incubator-pagespeed-ngx-release-{{nginx_ngx_pagespeed_version}}-beta/psol" diff --git a/tasks/package.yml b/tasks/package.yml index 2687b1a..e85de40 100644 --- a/tasks/package.yml +++ b/tasks/package.yml @@ -1,5 +1,7 @@ --- -# file: nginx/tasks/package.yml +- name: Run the equivalent of "apt-get update" as a separate step + apt: + update_cache: yes - name: Nginx | Make sure the ansible required dependencies are installed apt: @@ -7,9 +9,9 @@ - python3-pycurl - dirmngr - gnupg + - wget state: present -# make the KEY_ID a var - name: Add nginx GPG key command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 diff --git a/tasks/source.yml b/tasks/source.yml index 0a5e413..c1ceadb 100644 --- a/tasks/source.yml +++ b/tasks/source.yml @@ -14,6 +14,7 @@ - libpcre3-dev - libssl-dev - libssl1.1 + - wget - name: Nginx | Download the Nginx source release if not yet present get_url: