From 450c237094fc93401af34b489faa6b1de1edd23b Mon Sep 17 00:00:00 2001 From: Ram Mohan Rao Chukka <1331672+chukka@users.noreply.github.com> Date: Fri, 10 Jun 2022 04:47:47 +0530 Subject: [PATCH] [ansible] JFrog Platform 10.6.2 release (#219) --- Ansible/ansible_collections/jfrog/platform/CHANGELOG.md | 4 ++++ Ansible/ansible_collections/jfrog/platform/galaxy.yml | 2 +- .../jfrog/platform/roles/artifactory/defaults/main.yml | 2 +- .../jfrog/platform/roles/artifactory/vars/main.yml | 2 +- .../jfrog/platform/roles/artifactory_nginx/defaults/main.yml | 2 ++ .../jfrog/platform/roles/artifactory_nginx/tasks/main.yml | 4 ++-- .../{files/nginx.conf => templates/nginx.conf.j2} | 4 ++-- .../jfrog/platform/roles/artifactory_nginx_ssl/README.md | 1 + .../platform/roles/artifactory_nginx_ssl/defaults/main.yml | 2 ++ .../jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml | 4 ++-- .../{files/nginx.conf => templates/nginx.conf.j2} | 4 ++-- .../jfrog/platform/roles/distribution/vars/main.yml | 2 +- .../jfrog/platform/roles/insight/vars/main.yml | 2 +- .../jfrog/platform/roles/xray/defaults/main.yml | 2 +- .../jfrog/platform/roles/xray/vars/main.yml | 2 +- 15 files changed, 24 insertions(+), 15 deletions(-) rename Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/{files/nginx.conf => templates/nginx.conf.j2} (95%) rename Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/{files/nginx.conf => templates/nginx.conf.j2} (95%) diff --git a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md index c20bc21..cf43e65 100644 --- a/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md +++ b/Ansible/ansible_collections/jfrog/platform/CHANGELOG.md @@ -1,6 +1,10 @@ # JFrog Platform Ansible Collection Changelog All changes to this collection will be documented in this file. +## [10.6.2] - May 20, 2022 +* Allow nginx configuration for overriding worker_processes with a variable [GH-217](https://github.com/jfrog/JFrog-Cloud-Installers/pull/217) +* Product Updates/fixes + ## [10.6.1] - May 16, 2022 * Product Updates/fixes diff --git a/Ansible/ansible_collections/jfrog/platform/galaxy.yml b/Ansible/ansible_collections/jfrog/platform/galaxy.yml index d3d4ef1..c51034e 100644 --- a/Ansible/ansible_collections/jfrog/platform/galaxy.yml +++ b/Ansible/ansible_collections/jfrog/platform/galaxy.yml @@ -9,7 +9,7 @@ namespace: "jfrog" name: "platform" # The version of the collection. Must be compatible with semantic versioning -version: "10.6.1" +version: "10.6.2" # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: "README.md" diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml index 7a59b76..6b2f416 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for artifactory # The version of artifactory to install -artifactory_version: 7.38.8 +artifactory_version: 7.38.10 # Set this to true when SSL is enabled (to use artifactory_nginx_ssl role), default to false (implies artifactory uses artifactory_nginx role ) artifactory_nginx_ssl_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml index df0a727..c2257fe 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.6.1 +platform_collection_version: 10.6.2 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml index aa41801..e4aee48 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml @@ -4,3 +4,5 @@ server_name: test.artifactory.com nginx_daemon: nginx + +nginx_worker_processes: 1 diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml index 0908757..bd38734 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/main.yml @@ -13,8 +13,8 @@ - name: Copy nginx.conf file become: yes - copy: - src: nginx.conf + template: + src: nginx.conf.j2 dest: /etc/nginx/nginx.conf owner: root group: root diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/nginx.conf.j2 similarity index 95% rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf rename to Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/nginx.conf.j2 index 19f9422..31fd498 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/files/nginx.conf +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/nginx.conf.j2 @@ -1,5 +1,5 @@ #user nobody; -worker_processes 1; +worker_processes {{ nginx_worker_processes }}; error_log /var/log/nginx/error.log info; #pid logs/nginx.pid; events { @@ -34,4 +34,4 @@ http { #tcp_nopush on; #keepalive_timeout 0; keepalive_timeout 65; -} \ No newline at end of file +} diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md index cb43b09..8b524ac 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md @@ -5,3 +5,4 @@ The artifactory_nginx_ssl role installs and configures nginx for SSL. * _server_name_: This is the server name. eg. "artifactory.54.175.51.178.xip.io" * _certificate_: This is the SSL cert. * _certificate_key_: This is the SSL private key. +* _nginx_worker_processes_: The worker_processes configuration for nginx. Defaults to 1. diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml index 18081b7..195979a 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml @@ -6,3 +6,5 @@ nginx_daemon: nginx redirect_http_to_https_enabled: true + +nginx_worker_processes: 1 diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml index 4335c5e..69330d5 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml @@ -21,8 +21,8 @@ - name: Configure main nginx conf file. become: yes - copy: - src: nginx.conf + template: + src: nginx.conf.j2 dest: /etc/nginx/nginx.conf owner: root group: root diff --git a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/files/nginx.conf b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/nginx.conf.j2 similarity index 95% rename from Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/files/nginx.conf rename to Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/nginx.conf.j2 index 19f9422..31fd498 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/files/nginx.conf +++ b/Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/nginx.conf.j2 @@ -1,5 +1,5 @@ #user nobody; -worker_processes 1; +worker_processes {{ nginx_worker_processes }}; error_log /var/log/nginx/error.log info; #pid logs/nginx.pid; events { @@ -34,4 +34,4 @@ http { #tcp_nopush on; #keepalive_timeout 0; keepalive_timeout 65; -} \ No newline at end of file +} diff --git a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml index 52aea1d..cbeede8 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.6.1 +platform_collection_version: 10.6.2 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml index 52aea1d..cbeede8 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.6.1 +platform_collection_version: 10.6.2 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml index 64a453c..527605a 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/defaults/main.yml @@ -1,7 +1,7 @@ # defaults file for xray # The version of xray to install -xray_version: 3.48.2 +xray_version: 3.49.0 # whether to enable HA xray_ha_enabled: false diff --git a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml index 52aea1d..cbeede8 100644 --- a/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml +++ b/Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml @@ -1,5 +1,5 @@ # platform collection version -platform_collection_version: 10.6.1 +platform_collection_version: 10.6.2 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone) ansible_marketplace: galaxy