[ansible] JFrog Platform 10.9.0 release (#242)

* Issue #136 (#230)

- added boolean variable to decide whether to add a redirect directive to the nginx config when the docker subdomain feature is used.

Co-authored-by: Ram Mohan Rao Chukka <1331672+chukka@users.noreply.github.com>

* [ansible] Call "installService.sh" after upgrading Artifactory (#238)

* Issue #207 - added compatibility with Amazon Linux 2 (#231)

Co-authored-by: Ram Mohan Rao Chukka <1331672+chukka@users.noreply.github.com>

* [ansible] JFrog Platform 10.9.0 release

Co-authored-by: Johannes Brunswicker <johannes.brunswicker@gmail.com>
Co-authored-by: Christian Bönning <hexa2k9@users.noreply.github.com>

Ansible/ansible_collections/jfrog/platform/CHANGELOG.md

@@ -1,6 +1,13 @@
 # JFrog Platform Ansible Collection Changelog
 All changes to this collection will be documented in this file.
 
+## [10.9.0] - Oct 11, 2022
+* Product Updates/fixes
+* Fixed strange permissions for TLS directories [GH-193](https://github.com/jfrog/JFrog-Cloud-Installers/issues/193)
+* Added support for Docker registries via subdomain [GH-136](https://github.com/jfrog/JFrog-Cloud-Installers/issues/136)
+* Added Amazon Linux 2 compatibility [GH-231](https://github.com/jfrog/JFrog-Cloud-Installers/pull/231)
+* Added installService.sh for upgrading Artifactory [GH-238](https://github.com/jfrog/JFrog-Cloud-Installers/pull/238)
+
 ## [10.8.6] - Oct 4, 2022
 * Product Updates/fixes
 

Ansible/ansible_collections/jfrog/platform/README.md

@@ -121,6 +121,7 @@ The JFrog Platform Ansible Collection can be installed on the following operatin
 * Ubuntu LTS versions (18.04/20.4)
 * Centos/RHEL 7.x/8.x
 * Debian 9.x/10.x
+* Amazon Linux 2
 
 ## Known issues
 * Refer [here](https://github.com/jfrog/JFrog-Cloud-Installers/issues?q=is%3Aopen+is%3Aissue+label%3AAnsible)

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.8.6"
+version: "10.9.0"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: "README.md"

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.41.13
+artifactory_version: 7.46.3
 
 # 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

Ansible/ansible_collections/jfrog/platform/roles/artifactory/handlers/main.yml

@@ -5,6 +5,7 @@
   systemd:
     name: "{{ artifactory_daemon }}"
     state: restarted
+    daemon_reload: yes
 
 - name: stop artifactory
   become: yes

Ansible/ansible_collections/jfrog/platform/roles/artifactory/meta/main.yml

@@ -22,6 +22,9 @@ galaxy_info:
       versions:
         - stretch
         - buster
+    - name: Amazon
+      version:
+        - 2
   galaxy_tags:
     - artifactory
     - jfrog

Ansible/ansible_collections/jfrog/platform/roles/artifactory/shared/install_service.yml

@@ -0,0 +1,6 @@
+---
+- name: Create artifactory service
+  become: yes
+  command: "{{ artifactory_home }}/app/bin/installService.sh"
+  args:
+    creates: "{{ artifactory_service_file }}"

Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/install.yml

@@ -188,11 +188,8 @@
 - name: Restore SELinux content
   include_tasks: shared/selinux_restore_context.yml
 
-- name: Create artifactory service
+- name: Install Service
-  become: yes
+  include_tasks: shared/install_service.yml
-  command: "{{ artifactory_home }}/app/bin/installService.sh"
-  args:
-    creates: "{{ artifactory_service_file }}"
 
 - name: Ensure permissions are correct
   include_tasks: shared/ensure_permissions_correct.yml

Ansible/ansible_collections/jfrog/platform/roles/artifactory/tasks/upgrade.yml

@@ -118,6 +118,9 @@
     - artifactory_systemyaml_override or (not systemyaml.stat.exists)
   notify: restart artifactory
 
+- name: Install Service
+  include_tasks: shared/install_service.yml
+
 - name: Restore SELinux content
   include_tasks: shared/selinux_restore_context.yml
 

Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/distro/Amazon.yml

@@ -0,0 +1 @@
+selinux_policy_package: policycoreutils-python

Ansible/ansible_collections/jfrog/platform/roles/artifactory/vars/main.yml

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 10.8.6
+platform_collection_version: 10.9.0
 
 # indicates where this collection was downloaded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/README.md

@@ -1,5 +1,8 @@
 # artifactory_nginx
+
 This role installs NGINX for artifactory. This role is automatically called by the artifactory role and isn't intended to be used separately.
 
 ## Role Variables
-* _server_name_: **mandatory** This is the server name. eg. "artifactory.54.175.51.178.xip.io"
+
+* _server_name_: **mandatory** This is the server name. eg. "artifactory.54.175.51.178.xip.io"
+* _artifactory_docker_registry_subdomain_: Whether to add a redirect directive to the nginx config for the use of docker subdomains.

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/defaults/main.yml

@@ -6,3 +6,4 @@ server_name: test.artifactory.com
 nginx_daemon: nginx
 
 nginx_worker_processes: 1
+artifactory_docker_registry_subdomain: false

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/meta/main.yml

@@ -22,6 +22,9 @@ galaxy_info:
       versions:
         - stretch
         - buster
+    - name: Amazon
+      version:
+        - 2
   galaxy_tags:
     - artifactory
     - jfrog

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/tasks/RedHat.yml

@@ -14,7 +14,7 @@
     content: |
         [nginx-stable]
         name=nginx stable repo
-        baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
+        baseurl=http://nginx.org/packages/{{ (ansible_distribution == 'Amazon')|ternary('amzn2','centos') }}/$releasever/$basearch/
         gpgcheck=1
         enabled=1
         gpgkey=https://nginx.org/keys/nginx_signing.key

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx/templates/artifactory.conf.j2

@@ -21,6 +21,7 @@
   error_log /var/log/nginx/artifactory-error.log;
   rewrite ^/$ /ui/ redirect;
   rewrite ^/ui$ /ui/ redirect;
+  {% if artifactory_docker_registry_subdomain %}rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2;{% endif %}
   chunked_transfer_encoding on;
   client_max_body_size 0;
   location / {

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/README.md

@@ -6,3 +6,5 @@ The artifactory_nginx_ssl role installs and configures nginx for SSL.
 * _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.
+* _artifactory_docker_registry_subdomain_: Whether to add a redirect directive to the nginx config for the use of docker
+  subdomains.

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/defaults/main.yml

@@ -8,3 +8,4 @@ nginx_daemon: nginx
 redirect_http_to_https_enabled: true
 
 nginx_worker_processes: 1
+artifactory_docker_registry_subdomain: false

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/meta/main.yml

@@ -22,6 +22,9 @@ galaxy_info:
       versions:
         - stretch
         - buster
+    - name: Amazon
+      version:
+        - 2
   galaxy_tags:
     - artifactory
     - jfrog

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/RedHat.yml

@@ -14,7 +14,7 @@
     content: |
         [nginx-stable]
         name=nginx stable repo
-        baseurl=http://nginx.org/packages/centos/$releasever/$basearch/
+        baseurl=http://nginx.org/packages/{{ (ansible_distribution == 'Amazon')|ternary('amzn2','centos') }}/$releasever/$basearch/
         gpgcheck=1
         enabled=1
         gpgkey=https://nginx.org/keys/nginx_signing.key

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/tasks/main.yml

@@ -54,7 +54,7 @@
   file:
     path: "/var/opt/jfrog/nginx/ssl"
     state: directory
-    mode: 0644
+    mode: 0755
 
 - name: Configure certificate
   become: yes
@@ -69,7 +69,7 @@
   file:
     path: "/etc/pki/tls"
     state: directory
-    mode: 0644
+    mode: 0755
 
 - name: Configure key
   become: yes

Ansible/ansible_collections/jfrog/platform/roles/artifactory_nginx_ssl/templates/artifactory.conf.j2

@@ -26,6 +26,7 @@
   error_log /var/log/nginx/artifactory-error.log;
   rewrite ^/$ /ui/ redirect;
   rewrite ^/ui$ /ui/ redirect;
+  {% if artifactory_docker_registry_subdomain %}rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/$repo/$1/$2;{% endif %}
   chunked_transfer_encoding on;
   client_max_body_size 0;
   location / {

Ansible/ansible_collections/jfrog/platform/roles/distribution/vars/main.yml

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 10.8.6
+platform_collection_version: 10.9.0
 
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy

Ansible/ansible_collections/jfrog/platform/roles/insight/defaults/main.yml

@@ -1,7 +1,7 @@
 # defaults file for insight
 
 # The version of insight to install
-insight_version: 1.12.0
+insight_version: 1.12.1
 
 # whether to enable HA
 insight_ha_enabled: false

Ansible/ansible_collections/jfrog/platform/roles/insight/vars/main.yml

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 10.8.6
+platform_collection_version: 10.9.0
 
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy

Ansible/ansible_collections/jfrog/platform/roles/xray/vars/main.yml

@@ -1,5 +1,5 @@
 # platform collection version
-platform_collection_version: 10.8.6
+platform_collection_version: 10.9.0
 
 # indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
 ansible_marketplace: galaxy