Skip to content

Commit

Permalink
Merge branch 'master' into feature/355
Browse files Browse the repository at this point in the history
  • Loading branch information
bbaassssiiee authored Jul 18, 2024
2 parents 2509971 + f969566 commit cd07f82
Show file tree
Hide file tree
Showing 1,411 changed files with 273 additions and 116 deletions.
30 changes: 28 additions & 2 deletions Ansible/ansible_collections/jfrog/platform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
# JFrog Platform Ansible Collection Changelog
All changes to this collection will be documented in this file.

## [10.17.2] - Mar 12, 2024

## [10.18.4] - Mar 12, 2024
* artifactory_nginx_ssl - OCSP stapling support [GH-358](https://github.com/jfrog/JFrog-Cloud-Installers/pull/358)

## [10.18.3] - July 15, 2024
* Product Updates/fixes

## [10.18.2] - June 12, 2024
* Distribution - Fixed redis directory permission bug for upgrades
* Product Updates/fixes

## [10.18.1] - May 26, 2024
* Product Updates/fixes

## [10.18.0] - May 12, 2024
* Product Updates/fixes
* Added a new variable `artifactory_allowNonPostgresql` (default false) in systemYaml to run Artifactory with any database other than PostgreSQL
* Xray - Support RHEL 9 in rabbitmq setup [GH-354](https://github.com/jfrog/JFrog-Cloud-Installers/pull/354)

## [10.17.4] - May 2, 2024
* Product Updates/fixes

## [10.17.3] - Mar 14, 2024
* Postgres - Added no_log to postgres username password assertion [GH-374](https://github.com/jfrog/JFrog-Cloud-Installers/pull/374)
* Product Updates/fixes

## [10.17.2] - March 7, 2024
* Fix - ansible.cfg issue


## [10.17.1] - Feb 29, 2024
* Artifactory - Upgrade fails during the Check artifactory version [GH-369](https://github.com/jfrog/JFrog-Cloud-Installers/pull/369)
* Product Updates/fixes

## [10.17.0] - Jan 24, 2024
* **IMPORTANT**
Expand Down
4 changes: 3 additions & 1 deletion Ansible/ansible_collections/jfrog/platform/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,13 @@ The JFrog Platform Ansible Collection can be installed on the following operatin
* Ubuntu LTS versions (20.04/22.04)
* Centos/RHEL 8.x/9.x
* Debian 10.x/11.x
* Amazon Linux 2

## Note

From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x and Amazon Linux 2
* From 10.17.x platform collection, Artifactory (7.77.x) is not supported on Ubuntu - 18.04, Centos/RHEL - 7.x

* From 10.18.x platform collection , It is recommended to use Postgresql 15 for fresh installations , Change `postgres_version : 15` in postgres/defaults/vars.yaml

## How to avoid IPv6 binding

Expand Down
2 changes: 1 addition & 1 deletion Ansible/ansible_collections/jfrog/platform/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace: "jfrog"
name: "platform"

# The version of the collection. Must be compatible with semantic versioning
version: "10.17.1"
version: "10.18.3"

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: "README.md"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defaults file for artifactory

# The version of artifactory to install
artifactory_version: 7.77.6
artifactory_version: 7.84.17

# 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
Expand Down Expand Up @@ -64,6 +64,9 @@ artifactory_gid: 1030
# If this is an upgrade
artifactory_upgrade_only: false

# To run Artifactory with any database other than PostgreSQL, allowNonPostgresql set to true
artifactory_allowNonPostgresql: false

# Default username and password, uncomment and change to manage with ansible
# artifactory_admin_username: admin
# artifactory_admin_password: password
Expand All @@ -83,6 +86,7 @@ artifactory_systemyaml: |-
taskAffinity: {{ artifactory_taskaffinity }}
haEnabled: {{ artifactory_ha_enabled }}
database:
allowNonPostgresql: {{ artifactory_allowNonPostgresql }}
type: "{{ artifactory_db_type }}"
driver: "{{ artifactory_db_driver }}"
url: "{{ artifactory_db_url }}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# platform collection version
platform_collection_version: 10.17.1
platform_collection_version: 10.18.3

# indicates where this collection was downloaded from (galaxy, automation_hub, standalone)
ansible_marketplace: galaxy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# defaults file for distribution

# The version of distribution to install
distribution_version: 2.22.2
distribution_version: 2.25.1

# whether to enable HA
distribution_ha_enabled: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
state: directory
owner: "{{ distribution_user }}"
group: "{{ distribution_group }}"
mode: 0644
mode: 0755

- name: Configure redis config
become: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# platform collection version
platform_collection_version: 10.17.1
platform_collection_version: 10.18.3

# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
ansible_marketplace: galaxy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# platform collection version
platform_collection_version: 10.17.1
platform_collection_version: 10.18.3

# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
ansible_marketplace: galaxy
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
loop_control:
loop_var: curr_user
when: curr_user.enabled | bool
no_log: true # secret passwords

- name: Define OS-specific variables
ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Defaults file for xray

# The version of xray to install
xray_version: 3.90.1
xray_version: 3.98.5

# Whether to enable HA
xray_ha_enabled: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
el7
{%- elif linux_distro in ['centos8','redhat8'] -%}
el8
{%- elif linux_distro in ['centos9','redhat9'] -%}
el9
{%- endif -%}
- name: Find socat package
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
el7
{%- elif linux_distro in ['centos8','redhat8'] -%}
el8
{%- elif linux_distro in ['centos9','redhat9'] -%}
el9
{%- endif -%}
- name: Find erlang package
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# platform collection version
platform_collection_version: 10.17.1
platform_collection_version: 10.18.3

# indicates were this collection was downlaoded from (galaxy, automation_hub, standalone)
ansible_marketplace: galaxy
File renamed without changes.
1 change: 1 addition & 0 deletions Deprecated/Amazon/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*Note: Amazon Installers are no longer maintained. Feel free to review this code for your own POC concepts, but we are not continuing to update it or add features. We do plan to revive this in the future with a better implementation.*
Loading

0 comments on commit cd07f82

Please sign in to comment.