From 82efa2d06f5ba6f3e0827be775a8e72442fb2639 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Thu, 23 May 2024 17:53:17 +0100 Subject: [PATCH 01/11] use the proginal postgresql configuration file --- defaults/main.yml | 2 +- molecule/resources/tests/test_default.py | 10 +- .../resources/tests/test_extra_options.py | 4 +- tasks/initialise.yml | 23 +- templates/postgresql-conf-10-ubuntu.j2 | 673 ------------------ templates/postgresql-conf.j2 | 652 +---------------- 6 files changed, 32 insertions(+), 1332 deletions(-) delete mode 100644 templates/postgresql-conf-10-ubuntu.j2 diff --git a/defaults/main.yml b/defaults/main.yml index c3eb0e2..9b713a4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -58,7 +58,7 @@ postgresql_dist_redhat: postgresql_dist_debian: bindir: /usr/lib/postgresql/{{ postgresql_version }}/bin confdir: /etc/postgresql/{{ postgresql_version }}/main - conf_postgresql_src: postgresql-conf-10-ubuntu.j2 + conf_postgresql_src: postgresql-conf.j2 datadir: /var/lib/postgresql/{{ postgresql_version }}/main basename: postgresql-{{ postgresql_version }} service: postgresql diff --git a/molecule/resources/tests/test_default.py b/molecule/resources/tests/test_default.py index 35d9a64..dc58e44 100644 --- a/molecule/resources/tests/test_default.py +++ b/molecule/resources/tests/test_default.py @@ -2,7 +2,6 @@ import pytest import testinfra.utils.ansible_runner import uuid -from re import match from utils import get_version testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @@ -40,12 +39,15 @@ def test_server_listen(host): count_listen_addresses = 0 for line in f.split('\n'): - if match(r'\s*listen_addresses', line): + if 'listen_addresses' in line: count_listen_addresses += 1 listen_addresses = line assert count_listen_addresses == 1 - - assert listen_addresses == "listen_addresses = localhost" + if line.startswith('#'): + sub_line = listen_addresses.split('#')[0].strip() + else: + sub_line = listen_addresses.split('#')[1].strip() + assert sub_line == "listen_addresses = 'localhost'" def test_psql_version(host): diff --git a/molecule/resources/tests/test_extra_options.py b/molecule/resources/tests/test_extra_options.py index 4e6feb7..99df95b 100644 --- a/molecule/resources/tests/test_extra_options.py +++ b/molecule/resources/tests/test_extra_options.py @@ -23,9 +23,9 @@ def test_server_log_file_name(host): # Check previous day too in case this is run at midnight version = get_version(host) if host.system_info.distribution == 'rocky': - logdir = '/var/lib/pgsql/{version}/data/pg_log' + logdir = '/var/lib/pgsql/{version}/data/log' else: - logdir = '/var/lib/postgresql/{version}/main/pg_log' + logdir = '/var/lib/postgresql/{version}/main/log' date1 = datetime.today() date0 = date1 - timedelta(days=1) logdir = logdir.format(version=version) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index bfff92b..39e33db 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -22,16 +22,35 @@ PGSETUP_INITDB_OPTIONS: >- --encoding=UTF8 --locale=en_US.UTF-8 --auth-host=md5 + - name: postgres | Check for presence of "Modified by ome postgresql ansible role" in file + ansible.builtin.lineinfile: + path: "{{ postgresql_dist_confdir }}/postgresql.conf" + line: "#Modified by ome postgresql ansible role" + state: absent + check_mode: yes + changed_when: false + register: config_file_changed + + # read the default postgresql configuration file + - name: postgres | get the postgres conf file contents + become_user: "{{ postgresql_become_user }}" + ansible.builtin.slurp: + src: "{{ postgresql_dist_confdir }}/postgresql.conf" + register: postgres_config_file_contents + when: config_file_changed.found | default(0) == 0 + + - name: postgres | postgresql config file - template: + ansible.builtin.template: dest: >- {{ postgresql_dist_confdir }}/postgresql.conf src: "{{ postgresql_dist_conf_postgresql_src }}" mode: 0644 + owner: "{{ postgresql_become_user }}" notify: - restart postgresql + when: config_file_changed.found | default(0) == 0 - become_user: "{{ postgresql_become_user }}" - name: postgres | configure client authorisation template: diff --git a/templates/postgresql-conf-10-ubuntu.j2 b/templates/postgresql-conf-10-ubuntu.j2 deleted file mode 100644 index 06dc4aa..0000000 --- a/templates/postgresql-conf-10-ubuntu.j2 +++ /dev/null @@ -1,673 +0,0 @@ -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, run "pg_ctl reload", or execute -# "SELECT pg_reload_conf()". Some parameters, which are marked below, -# require a server shutdown and restart to take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: kB = kilobytes Time units: ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -data_directory = '/var/lib/postgresql/{{ postgresql_version }}/main' # use data in another directory - # (change requires restart) -hba_file = '/etc/postgresql/{{ postgresql_version }}/main/pg_hba.conf' # host-based authentication file - # (change requires restart) -ident_file = '/etc/postgresql/{{ postgresql_version }}/main/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -external_pid_file = '/var/run/postgresql/{{ postgresql_version }}-main.pid' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -#listen_addresses = 'localhost' # what IP address(es) to listen on; - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -port = 5432 # (change requires restart) -max_connections = 100 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - Security and Authentication - - -#authentication_timeout = 1min # 1s-600s -ssl = on -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers -#ssl_prefer_server_ciphers = on -#ssl_ecdh_curve = 'prime256v1' -#ssl_dh_params_file = '' -ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem' -ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key' -#ssl_ca_file = '' -#ssl_crl_file = '' -#password_encryption = md5 # md5 or scram-sha-256 -#db_user_namespace = off -#row_security = on - -# GSSAPI using Kerberos -#krb_server_keyfile = '' -#krb_caseins_users = off - -# - TCP Keepalives - -# see "man 7 tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -shared_buffers = 128MB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#maintenance_work_mem = 64MB # min 1MB -#replacement_sort_tuples = 150000 # limits use of replacement selection sort -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#max_stack_depth = 2MB # min 100kB -dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # use none to disable dynamic shared memory - # (change requires restart) - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kB, or -1 for no limit - -# - Kernel Resource Usage - - -#max_files_per_process = 1000 # min 25 - # (change requires restart) -#shared_preload_libraries = '' # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 10 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 512kB # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers -#max_parallel_workers = 8 # maximum number of max_worker_processes that - # can be used in parallel queries -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) -#backend_flush_after = 0 # measured in pages, 0 disables - - -#------------------------------------------------------------------------------ -# WRITE AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -#wal_level = replica # minimal, replica, or logical - # (change requires restart) -#fsync = on # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -#synchronous_commit = on # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux) - # fsync - # fsync_writethrough - # open_sync -#full_page_writes = on # recover from partial page writes -#wal_compression = off # enable compression of full-page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -#checkpoint_timeout = 5min # range 30s-1d -#max_wal_size = 1GB -#min_wal_size = 80MB -#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 256kB # measured in pages, 0 disables -#checkpoint_warning = 30s # 0 disables - -# - Archiving - - -#archive_mode = off # enables archiving; off, on, or always - # (change requires restart) -#archive_command = '' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -#archive_timeout = 0 # force a logfile segment switch after this - # number of seconds; 0 disables - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Server(s) - - -# Set these on the master and on any standby that will send replication data. - -#max_wal_senders = 10 # max number of walsender processes - # (change requires restart) -#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables - -#max_replication_slots = 10 # max number of replication slots - # (change requires restart) -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Master Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # method to choose sync standbys, number of sync standbys, - # and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a master server. - -#hot_standby = on # "off" disallows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from master - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt - -# - Subscribers - - -# These settings are ignored on a publisher. - -#max_logical_replication_workers = 4 # taken from max_worker_processes - # (change requires restart) -#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_bitmapscan = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above -#min_parallel_table_scan_size = 8MB -#min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#force_parallel_mode = off - - -#------------------------------------------------------------------------------ -# ERROR REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -logging_collector = on # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -log_directory = 'pg_log' # directory where log files are written, - # can be absolute or relative to PGDATA -log_filename = 'postgresql-%a.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -log_truncate_on_rotation = on # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. -log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -log_rotation_size = 0 # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (win32): -# (change requires restart) -#event_source = 'PostgreSQL' - -# - When to Log - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -log_line_prefix = '%m [%p] %q%u@%d ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %p = process ID - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -log_timezone = 'Etc/UTC' - - -# - Process Title - - -cluster_name = '{{ postgresql_version }}/main' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# RUNTIME STATISTICS -#------------------------------------------------------------------------------ - -# - Query/Index Statistics Collector - - -#track_activities = on -#track_counts = on -#track_io_timing = off -#track_functions = none # none, pl, all -#track_activity_query_size = 1024 # (change requires restart) -{% if postgresql_version < '15' %}stats_temp_directory = '/var/run/postgresql/{{ postgresql_version }}-main.pg_stat_tmp'{% endif %} - - -# - Statistics Monitoring - - -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off -#log_statement_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM PARAMETERS -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#search_path = '"$user", public' # schema names -#default_tablespace = '' # a tablespace name, '' uses the default -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_min_age = 50000000 -#vacuum_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_freeze_table_age = 150000000 -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_fuzzy_search_limit = 0 -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -timezone = 'Etc/UTC' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 0 # min -15, max 3 -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -lc_messages = 'C.UTF-8' # locale for system error message - # strings -lc_monetary = 'C.UTF-8' # locale for monetary formatting -lc_numeric = 'C.UTF-8' # locale for number formatting -lc_time = 'C.UTF-8' # locale for time formatting - -# default configuration for text search -default_text_search_config = 'pg_catalog.english' - -# - Other Defaults - - -#dynamic_library_path = '$libdir' -#local_preload_libraries = '' -#session_preload_libraries = '' - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_relation = -2 # negative values mean - # (max_pred_locks_per_transaction - # / -max_pred_locks_per_relation) - 1 -#max_pred_locks_per_page = 2 # min 0 - - -#------------------------------------------------------------------------------ -# VERSION/PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#default_with_oids = off -#escape_string_warning = on -#lo_compat_privileges = off -#operator_precedence_warning = off -#quote_all_identifiers = off -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? -#data_sync_retry = off # retry or panic on failure to fsync - # data? - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. Note that these are directives, not variable -# assignments, so they can usefully be given more than once. - -include_dir = 'conf.d' # include files ending in '.conf' from - # a directory, e.g., 'conf.d' -#include_if_exists = '...' # include file only if it exists -#include = '...' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here - - -#------------------------------------------------------------------------------ -# ANSIBLE OPTIONS -#------------------------------------------------------------------------------ - -listen_addresses = {{ postgresql_server_listen }} - -{% for option in (postgresql_server_conf | sort) %} -{{ option }} = {{ postgresql_server_conf[option] }} -{% endfor %} diff --git a/templates/postgresql-conf.j2 b/templates/postgresql-conf.j2 index 0f1193d..5184f24 100644 --- a/templates/postgresql-conf.j2 +++ b/templates/postgresql-conf.j2 @@ -1,653 +1,5 @@ -# {{ ansible_managed }} - -# ----------------------------- -# PostgreSQL configuration file -# ----------------------------- -# -# This file consists of lines of the form: -# -# name = value -# -# (The "=" is optional.) Whitespace may be used. Comments are introduced with -# "#" anywhere on a line. The complete list of parameter names and allowed -# values can be found in the PostgreSQL documentation. -# -# The commented-out settings shown in this file represent the default values. -# Re-commenting a setting is NOT sufficient to revert it to the default value; -# you need to reload the server. -# -# This file is read on server startup and when the server receives a SIGHUP -# signal. If you edit the file on a running system, you have to SIGHUP the -# server for the changes to take effect, or use "pg_ctl reload". Some -# parameters, which are marked below, require a server shutdown and restart to -# take effect. -# -# Any parameter can also be given as a command-line option to the server, e.g., -# "postgres -c log_connections=on". Some parameters can be changed at run time -# with the "SET" SQL command. -# -# Memory units: kB = kilobytes Time units: ms = milliseconds -# MB = megabytes s = seconds -# GB = gigabytes min = minutes -# TB = terabytes h = hours -# d = days - - -#------------------------------------------------------------------------------ -# FILE LOCATIONS -#------------------------------------------------------------------------------ - -# The default values of these variables are driven from the -D command-line -# option or PGDATA environment variable, represented here as ConfigDir. - -#data_directory = 'ConfigDir' # use data in another directory - # (change requires restart) -#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file - # (change requires restart) -#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file - # (change requires restart) - -# If external_pid_file is not explicitly set, no extra PID file is written. -#external_pid_file = '' # write an extra PID file - # (change requires restart) - - -#------------------------------------------------------------------------------ -# CONNECTIONS AND AUTHENTICATION -#------------------------------------------------------------------------------ - -# - Connection Settings - - -#listen_addresses = 'localhost' # what IP address(es) to listen on; - # comma-separated list of addresses; - # defaults to 'localhost'; use '*' for all - # (change requires restart) -#port = 5432 # (change requires restart) -max_connections = 100 # (change requires restart) -#superuser_reserved_connections = 3 # (change requires restart) -#unix_socket_directories = '/var/run/postgresql, /tmp' # comma-separated list of directories - # (change requires restart) -#unix_socket_group = '' # (change requires restart) -#unix_socket_permissions = 0777 # begin with 0 to use octal notation - # (change requires restart) -#bonjour = off # advertise server via Bonjour - # (change requires restart) -#bonjour_name = '' # defaults to the computer name - # (change requires restart) - -# - Security and Authentication - - -#authentication_timeout = 1min # 1s-600s -#ssl = off # (change requires restart) -#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers - # (change requires restart) -#ssl_prefer_server_ciphers = on # (change requires restart) -#ssl_ecdh_curve = 'prime256v1' # (change requires restart) -#ssl_cert_file = 'server.crt' # (change requires restart) -#ssl_key_file = 'server.key' # (change requires restart) -#ssl_ca_file = '' # (change requires restart) -#ssl_crl_file = '' # (change requires restart) -#password_encryption = on -#db_user_namespace = off -#row_security = on - -# GSSAPI using Kerberos -#krb_server_keyfile = '' -#krb_caseins_users = off - -# - TCP Keepalives - -# see "man 7 tcp" for details - -#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; - # 0 selects the system default -#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; - # 0 selects the system default -#tcp_keepalives_count = 0 # TCP_KEEPCNT; - # 0 selects the system default - - -#------------------------------------------------------------------------------ -# RESOURCE USAGE (except WAL) -#------------------------------------------------------------------------------ - -# - Memory - - -shared_buffers = 128MB # min 128kB - # (change requires restart) -#huge_pages = try # on, off, or try - # (change requires restart) -#temp_buffers = 8MB # min 800kB -#max_prepared_transactions = 0 # zero disables the feature - # (change requires restart) -# Caution: it is not advisable to set max_prepared_transactions nonzero unless -# you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB -#maintenance_work_mem = 64MB # min 1MB -#replacement_sort_tuples = 150000 # limits use of replacement selection sort -#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem -#max_stack_depth = 2MB # min 100kB -dynamic_shared_memory_type = posix # the default is the first option - # supported by the operating system: - # posix - # sysv - # windows - # mmap - # use none to disable dynamic shared memory - -# - Disk - - -#temp_file_limit = -1 # limits per-process temp file space - # in kB, or -1 for no limit - -# - Kernel Resource Usage - - -#max_files_per_process = 1000 # min 25 - # (change requires restart) -#shared_preload_libraries = '' # (change requires restart) - -# - Cost-Based Vacuum Delay - - -#vacuum_cost_delay = 0 # 0-100 milliseconds -#vacuum_cost_page_hit = 1 # 0-10000 credits -#vacuum_cost_page_miss = 10 # 0-10000 credits -#vacuum_cost_page_dirty = 20 # 0-10000 credits -#vacuum_cost_limit = 200 # 1-10000 credits - -# - Background Writer - - -#bgwriter_delay = 200ms # 10-10000ms between rounds -#bgwriter_lru_maxpages = 100 # 0-1000 max buffers written/round -#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round -#bgwriter_flush_after = 512kB # measured in pages, 0 disables - -# - Asynchronous Behavior - - -#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching -#max_worker_processes = 8 # (change requires restart) -#max_parallel_workers_per_gather = 0 # taken from max_worker_processes -#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate - # (change requires restart) -#backend_flush_after = 0 # measured in pages, 0 disables - - -#------------------------------------------------------------------------------ -# WRITE AHEAD LOG -#------------------------------------------------------------------------------ - -# - Settings - - -#wal_level = minimal # minimal, replica, or logical - # (change requires restart) -#fsync = on # flush data to disk for crash safety - # (turning this off can cause - # unrecoverable data corruption) -#synchronous_commit = on # synchronization level; - # off, local, remote_write, remote_apply, or on -#wal_sync_method = fsync # the default is the first option - # supported by the operating system: - # open_datasync - # fdatasync (default on Linux) - # fsync - # fsync_writethrough - # open_sync -#full_page_writes = on # recover from partial page writes -#wal_compression = off # enable compression of full-page writes -#wal_log_hints = off # also do full page writes of non-critical updates - # (change requires restart) -#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers - # (change requires restart) -#wal_writer_delay = 200ms # 1-10000 milliseconds -#wal_writer_flush_after = 1MB # measured in pages, 0 disables - -#commit_delay = 0 # range 0-100000, in microseconds -#commit_siblings = 5 # range 1-1000 - -# - Checkpoints - - -#checkpoint_timeout = 5min # range 30s-1d -#max_wal_size = 1GB -#min_wal_size = 80MB -#checkpoint_completion_target = 0.5 # checkpoint target duration, 0.0 - 1.0 -#checkpoint_flush_after = 256kB # measured in pages, 0 disables -#checkpoint_warning = 30s # 0 disables - -# - Archiving - - -#archive_mode = off # enables archiving; off, on, or always - # (change requires restart) -#archive_command = '' # command to use to archive a logfile segment - # placeholders: %p = path of file to archive - # %f = file name only - # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' -#archive_timeout = 0 # force a logfile segment switch after this - # number of seconds; 0 disables - - -#------------------------------------------------------------------------------ -# REPLICATION -#------------------------------------------------------------------------------ - -# - Sending Server(s) - - -# Set these on the master and on any standby that will send replication data. - -#max_wal_senders = 0 # max number of walsender processes - # (change requires restart) -#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables -#wal_sender_timeout = 60s # in milliseconds; 0 disables - -#max_replication_slots = 0 # max number of replication slots - # (change requires restart) -#track_commit_timestamp = off # collect timestamp of transaction commit - # (change requires restart) - -# - Master Server - - -# These settings are ignored on a standby server. - -#synchronous_standby_names = '' # standby servers that provide sync rep - # number of sync standbys and comma-separated list of application_name - # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed - -# - Standby Servers - - -# These settings are ignored on a master server. - -#hot_standby = off # "on" allows queries during recovery - # (change requires restart) -#max_standby_archive_delay = 30s # max delay before canceling queries - # when reading WAL from archive; - # -1 allows indefinite delay -#max_standby_streaming_delay = 30s # max delay before canceling queries - # when reading streaming WAL; - # -1 allows indefinite delay -#wal_receiver_status_interval = 10s # send replies at least this often - # 0 disables -#hot_standby_feedback = off # send info from standby to prevent - # query conflicts -#wal_receiver_timeout = 60s # time that receiver waits for - # communication from master - # in milliseconds; 0 disables -#wal_retrieve_retry_interval = 5s # time to wait before retrying to - # retrieve WAL after a failed attempt - - -#------------------------------------------------------------------------------ -# QUERY TUNING -#------------------------------------------------------------------------------ - -# - Planner Method Configuration - - -#enable_bitmapscan = on -#enable_hashagg = on -#enable_hashjoin = on -#enable_indexscan = on -#enable_indexonlyscan = on -#enable_material = on -#enable_mergejoin = on -#enable_nestloop = on -#enable_seqscan = on -#enable_sort = on -#enable_tidscan = on - -# - Planner Cost Constants - - -#seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above -#cpu_tuple_cost = 0.01 # same scale as above -#cpu_index_tuple_cost = 0.005 # same scale as above -#cpu_operator_cost = 0.0025 # same scale as above -#parallel_tuple_cost = 0.1 # same scale as above -#parallel_setup_cost = 1000.0 # same scale as above -#min_parallel_relation_size = 8MB -#effective_cache_size = 4GB - -# - Genetic Query Optimizer - - -#geqo = on -#geqo_threshold = 12 -#geqo_effort = 5 # range 1-10 -#geqo_pool_size = 0 # selects default based on effort -#geqo_generations = 0 # selects default based on effort -#geqo_selection_bias = 2.0 # range 1.5-2.0 -#geqo_seed = 0.0 # range 0.0-1.0 - -# - Other Planner Options - - -#default_statistics_target = 100 # range 1-10000 -#constraint_exclusion = partition # on, off, or partition -#cursor_tuple_fraction = 0.1 # range 0.0-1.0 -#from_collapse_limit = 8 -#join_collapse_limit = 8 # 1 disables collapsing of explicit - # JOIN clauses -#force_parallel_mode = off - - -#------------------------------------------------------------------------------ -# ERROR REPORTING AND LOGGING -#------------------------------------------------------------------------------ - -# - Where to Log - - -log_destination = 'stderr' # Valid values are combinations of - # stderr, csvlog, syslog, and eventlog, - # depending on platform. csvlog - # requires logging_collector to be on. - -# This is used when logging to stderr: -logging_collector = on # Enable capturing of stderr and csvlog - # into log files. Required to be on for - # csvlogs. - # (change requires restart) - -# These are only used if logging_collector is on: -log_directory = 'pg_log' # directory where log files are written, - # can be absolute or relative to PGDATA -log_filename = 'postgresql-%a.log' # log file name pattern, - # can include strftime() escapes -#log_file_mode = 0600 # creation mode for log files, - # begin with 0 to use octal notation -log_truncate_on_rotation = on # If on, an existing log file with the - # same name as the new log file will be - # truncated rather than appended to. - # But such truncation only occurs on - # time-driven rotation, not on restarts - # or size-driven rotation. Default is - # off, meaning append to existing files - # in all cases. -log_rotation_age = 1d # Automatic rotation of logfiles will - # happen after that time. 0 disables. -log_rotation_size = 0 # Automatic rotation of logfiles will - # happen after that much log output. - # 0 disables. - -# These are relevant when logging to syslog: -#syslog_facility = 'LOCAL0' -#syslog_ident = 'postgres' -#syslog_sequence_numbers = on -#syslog_split_messages = on - -# This is only relevant when logging to eventlog (win32): -#event_source = 'PostgreSQL' - -# - When to Log - - -#client_min_messages = notice # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # log - # notice - # warning - # error - -#log_min_messages = warning # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic - -#log_min_error_statement = error # values in order of decreasing detail: - # debug5 - # debug4 - # debug3 - # debug2 - # debug1 - # info - # notice - # warning - # error - # log - # fatal - # panic (effectively off) - -#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements - # and their durations, > 0 logs only - # statements running at least this number - # of milliseconds - - -# - What to Log - - -#debug_print_parse = off -#debug_print_rewritten = off -#debug_print_plan = off -#debug_pretty_print = on -#log_checkpoints = off -#log_connections = off -#log_disconnections = off -#log_duration = off -#log_error_verbosity = default # terse, default, or verbose messages -#log_hostname = off -log_line_prefix = '< %m > ' # special values: - # %a = application name - # %u = user name - # %d = database name - # %r = remote host and port - # %h = remote host - # %p = process ID - # %t = timestamp without milliseconds - # %m = timestamp with milliseconds - # %n = timestamp with milliseconds (as a Unix epoch) - # %i = command tag - # %e = SQL state - # %c = session ID - # %l = session line number - # %s = session start timestamp - # %v = virtual transaction ID - # %x = transaction ID (0 if none) - # %q = stop here in non-session - # processes - # %% = '%' - # e.g. '<%u%%%d> ' -#log_lock_waits = off # log lock waits >= deadlock_timeout -#log_statement = 'none' # none, ddl, mod, all -#log_replication_commands = off -#log_temp_files = -1 # log temporary files equal or larger - # than the specified size in kilobytes; - # -1 disables, 0 logs all temp files -log_timezone = 'UTC' - - -# - Process Title - - -#cluster_name = '' # added to process titles if nonempty - # (change requires restart) -#update_process_title = on - - -#------------------------------------------------------------------------------ -# RUNTIME STATISTICS -#------------------------------------------------------------------------------ - -# - Query/Index Statistics Collector - - -#track_activities = on -#track_counts = on -#track_io_timing = off -#track_functions = none # none, pl, all -#track_activity_query_size = 1024 # (change requires restart) -#stats_temp_directory = 'pg_stat_tmp' - - -# - Statistics Monitoring - - -#log_parser_stats = off -#log_planner_stats = off -#log_executor_stats = off -#log_statement_stats = off - - -#------------------------------------------------------------------------------ -# AUTOVACUUM PARAMETERS -#------------------------------------------------------------------------------ - -#autovacuum = on # Enable autovacuum subprocess? 'on' - # requires track_counts to also be on. -#log_autovacuum_min_duration = -1 # -1 disables, 0 logs all actions and - # their durations, > 0 logs only - # actions running at least this number - # of milliseconds. -#autovacuum_max_workers = 3 # max number of autovacuum subprocesses - # (change requires restart) -#autovacuum_naptime = 1min # time between autovacuum runs -#autovacuum_vacuum_threshold = 50 # min number of row updates before - # vacuum -#autovacuum_analyze_threshold = 50 # min number of row updates before - # analyze -#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum -#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze -#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum - # (change requires restart) -#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age - # before forced vacuum - # (change requires restart) -#autovacuum_vacuum_cost_delay = 20ms # default vacuum cost delay for - # autovacuum, in milliseconds; - # -1 means use vacuum_cost_delay -#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for - # autovacuum, -1 means use - # vacuum_cost_limit - - -#------------------------------------------------------------------------------ -# CLIENT CONNECTION DEFAULTS -#------------------------------------------------------------------------------ - -# - Statement Behavior - - -#search_path = '"$user", public' # schema names -#default_tablespace = '' # a tablespace name, '' uses the default -#temp_tablespaces = '' # a list of tablespace names, '' uses - # only default tablespace -#check_function_bodies = on -#default_transaction_isolation = 'read committed' -#default_transaction_read_only = off -#default_transaction_deferrable = off -#session_replication_role = 'origin' -#statement_timeout = 0 # in milliseconds, 0 is disabled -#lock_timeout = 0 # in milliseconds, 0 is disabled -#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled -#vacuum_freeze_min_age = 50000000 -#vacuum_freeze_table_age = 150000000 -#vacuum_multixact_freeze_min_age = 5000000 -#vacuum_multixact_freeze_table_age = 150000000 -#bytea_output = 'hex' # hex, escape -#xmlbinary = 'base64' -#xmloption = 'content' -#gin_fuzzy_search_limit = 0 -#gin_pending_list_limit = 4MB - -# - Locale and Formatting - - -datestyle = 'iso, mdy' -#intervalstyle = 'postgres' -timezone = 'UTC' -#timezone_abbreviations = 'Default' # Select the set of available time zone - # abbreviations. Currently, there are - # Default - # Australia (historical usage) - # India - # You can create your own file in - # share/timezonesets/. -#extra_float_digits = 0 # min -15, max 3 -#client_encoding = sql_ascii # actually, defaults to database - # encoding - -# These settings are initialized by initdb, but they can be changed. -lc_messages = 'en_US.UTF-8' # locale for system error message - # strings -lc_monetary = 'en_US.UTF-8' # locale for monetary formatting -lc_numeric = 'en_US.UTF-8' # locale for number formatting -lc_time = 'en_US.UTF-8' # locale for time formatting - -# default configuration for text search -default_text_search_config = 'pg_catalog.english' - -# - Other Defaults - - -#dynamic_library_path = '$libdir' -#local_preload_libraries = '' -#session_preload_libraries = '' - - -#------------------------------------------------------------------------------ -# LOCK MANAGEMENT -#------------------------------------------------------------------------------ - -#deadlock_timeout = 1s -#max_locks_per_transaction = 64 # min 10 - # (change requires restart) -#max_pred_locks_per_transaction = 64 # min 10 - # (change requires restart) - - -#------------------------------------------------------------------------------ -# VERSION/PLATFORM COMPATIBILITY -#------------------------------------------------------------------------------ - -# - Previous PostgreSQL Versions - - -#array_nulls = on -#backslash_quote = safe_encoding # on, off, or safe_encoding -#default_with_oids = off -#escape_string_warning = on -#lo_compat_privileges = off -#operator_precedence_warning = off -#quote_all_identifiers = off -#sql_inheritance = on -#standard_conforming_strings = on -#synchronize_seqscans = on - -# - Other Platforms and Clients - - -#transform_null_equals = off - - -#------------------------------------------------------------------------------ -# ERROR HANDLING -#------------------------------------------------------------------------------ - -#exit_on_error = off # terminate session on any error? -#restart_after_crash = on # reinitialize after backend crash? - - -#------------------------------------------------------------------------------ -# CONFIG FILE INCLUDES -#------------------------------------------------------------------------------ - -# These options allow settings to be loaded from files other than the -# default postgresql.conf. - -#include_dir = 'conf.d' # include files ending in '.conf' from - # directory 'conf.d' -#include_if_exists = 'exists.conf' # include file only if it exists -#include = 'special.conf' # include file - - -#------------------------------------------------------------------------------ -# CUSTOMIZED OPTIONS -#------------------------------------------------------------------------------ - -# Add settings for extensions here - - -#------------------------------------------------------------------------------ -# ANSIBLE OPTIONS -#------------------------------------------------------------------------------ - -listen_addresses = {{ postgresql_server_listen }} +#Modified by ome postgresql ansible role +{{ postgres_config_file_contents['content'] | b64decode | regex_replace('}$', '') }} {% for option in (postgresql_server_conf | sort) %} {{ option }} = {{ postgresql_server_conf[option] }} From 3637a0ebfcce328b6c6ff9bbd73d8b68e4ec0651 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Sat, 25 May 2024 01:18:27 +0100 Subject: [PATCH 02/11] Allow updating the config, add test case and restore listen_addresses --- defaults/main.yml | 1 + molecule/resources/tests/test_default.py | 21 +++++++---- tasks/initialise.yml | 46 ++++++++++++++++++++---- templates/postgresql-conf.j2 | 2 ++ 4 files changed, 56 insertions(+), 14 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9b713a4..41dfea9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,6 +31,7 @@ postgresql_server_auth: [] # Recursively reset the owner/group of the postgres datadir? postgresql_server_chown_datadir: false +postgres_config_file_contents: '' ###################################################################### # Internal role variables, do not modify ###################################################################### diff --git a/molecule/resources/tests/test_default.py b/molecule/resources/tests/test_default.py index dc58e44..c0dc9e5 100644 --- a/molecule/resources/tests/test_default.py +++ b/molecule/resources/tests/test_default.py @@ -2,6 +2,7 @@ import pytest import testinfra.utils.ansible_runner import uuid +from re import match from utils import get_version testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @@ -39,15 +40,23 @@ def test_server_listen(host): count_listen_addresses = 0 for line in f.split('\n'): - if 'listen_addresses' in line: + if match(r'\s*listen_addresses', line): count_listen_addresses += 1 listen_addresses = line assert count_listen_addresses == 1 - if line.startswith('#'): - sub_line = listen_addresses.split('#')[0].strip() + + assert listen_addresses == "listen_addresses = localhost" + + +def test_backup_config_exist(host): + version = get_version(host) + if host.system_info.distribution == 'rocky': + config_backup = '/var/lib/pgsql/{version}/data/postgresql.conf.backup' else: - sub_line = listen_addresses.split('#')[1].strip() - assert sub_line == "listen_addresses = 'localhost'" + config_backup = '/etc/postgresql/{version}/main/postgresql.conf.backup' + with host.sudo(): + backup_file = config_backup.format(version=version) + assert host.file(backup_file).is_file def test_psql_version(host): @@ -56,8 +65,6 @@ def test_psql_version(host): assert out.startswith('psql (PostgreSQL) {}.'.format(ver)) -# Create - def createdb(host, db, should_pass, password, name): try: host.check_output( diff --git a/tasks/initialise.yml b/tasks/initialise.yml index 39e33db..8702822 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -31,16 +31,49 @@ changed_when: false register: config_file_changed + - name: postgres | Check that the postgresql.conf.backup file exists + ansible.builtin.stat: + path: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" + register: backup_result + + # read the default postgresql configuration file - name: postgres | get the postgres conf file contents become_user: "{{ postgresql_become_user }}" ansible.builtin.slurp: src: "{{ postgresql_dist_confdir }}/postgresql.conf" - register: postgres_config_file_contents - when: config_file_changed.found | default(0) == 0 + register: postgres_config_file_contents_o + when: + - not backup_result.stat.exists + + # read the default postgresql configuration file + - name: postgres | get the postgres conf file contents from backup + become_user: "{{ postgresql_become_user }}" + ansible.builtin.slurp: + src: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" + register: postgres_config_file_contents_b + when: backup_result.stat.exists + - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_o }} + when: + - not backup_result.stat.exists - - name: postgres | postgresql config file + - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_b }} + when: + - backup_result.stat.exists + + - name: postgres | Copy a postgresql.conf to postgresql.conf.backup + become_user: "{{ postgresql_become_user }}" + ansible.builtin.copy: + src: "{{ postgresql_dist_confdir }}/postgresql.conf" + dest: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" + remote_src: yes + when: + - not backup_result.stat.exists + - config_file_changed.found | default(0) == 0 + + - name: postgres | copy postgresql config file + become_user: "{{ postgresql_become_user }}" ansible.builtin.template: dest: >- {{ postgresql_dist_confdir }}/postgresql.conf @@ -49,10 +82,11 @@ owner: "{{ postgresql_become_user }}" notify: - restart postgresql - when: config_file_changed.found | default(0) == 0 - + when: + - config_file_changed.found | default(0) == 0 or backup_result.stat.exists - name: postgres | configure client authorisation + become_user: "{{ postgresql_become_user }}" template: dest: "{{ postgresql_dist_confdir }}/pg_hba.conf" src: pg_hba-conf.j2 @@ -60,8 +94,6 @@ notify: - restart postgresql - become_user: "{{ postgresql_become_user }}" - - name: postgres | start service service: enabled: true diff --git a/templates/postgresql-conf.j2 b/templates/postgresql-conf.j2 index 5184f24..722eb7e 100644 --- a/templates/postgresql-conf.j2 +++ b/templates/postgresql-conf.j2 @@ -1,6 +1,8 @@ #Modified by ome postgresql ansible role {{ postgres_config_file_contents['content'] | b64decode | regex_replace('}$', '') }} +listen_addresses = {{ postgresql_server_listen }} + {% for option in (postgresql_server_conf | sort) %} {{ option }} = {{ postgresql_server_conf[option] }} {% endfor %} From 35930b0daa58f6756141550c77bd7cf6ec54eace Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Tue, 11 Jun 2024 10:07:34 +0100 Subject: [PATCH 03/11] Fix re-run the role without having the org file --- defaults/main.yml | 14 +++++ molecule/resources/tests/test_default.py | 4 +- tasks/initialise.yml | 67 ++++++++++++++++++------ tasks/org_config_file.yml | 45 ++++++++++++++++ templates/postgresql-conf.j2 | 2 +- 5 files changed, 114 insertions(+), 18 deletions(-) create mode 100644 tasks/org_config_file.yml diff --git a/defaults/main.yml b/defaults/main.yml index 41dfea9..3f7de38 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,6 +53,7 @@ postgresql_dist_redhat: (postgresql_package_version | length > 0) | ternary('-' + postgresql_package_version, '') }} + conf_sample_file: "/usr/pgsql-{{ postgresql_version }}/share/postgresql.conf.sample" # Attributes are parsed and used to set facts at tasks/debian.yml. # Debian variation, following the same principles of postgresql_dist_redhat @@ -62,4 +63,17 @@ postgresql_dist_debian: conf_postgresql_src: postgresql-conf.j2 datadir: /var/lib/postgresql/{{ postgresql_version }}/main basename: postgresql-{{ postgresql_version }} + conf_sample_file: "/usr/share/postgresql/{{ postgresql_version }}/postgresql.conf.sample" service: postgresql + +# conf_sample_file: sample configuration file, it should be copied during the installation by the installation package + +# the following two variables are used to download link ofr the source to get the sample configuration file +# It will be used in case of the sample file is not find locally for any reason +versions_source_download: + 13: "13.15" + 14: "14.12" + 15: "15.7" + 16: "16.3" + +source_download_linnk: "https://ftp.postgresql.org/pub/source/v{{ versions_source_download [postgresql_version] }}/postgresql-{{ versions_source_download [postgresql_version] }}.tar.gz" diff --git a/molecule/resources/tests/test_default.py b/molecule/resources/tests/test_default.py index c0dc9e5..46e0f1b 100644 --- a/molecule/resources/tests/test_default.py +++ b/molecule/resources/tests/test_default.py @@ -51,9 +51,9 @@ def test_server_listen(host): def test_backup_config_exist(host): version = get_version(host) if host.system_info.distribution == 'rocky': - config_backup = '/var/lib/pgsql/{version}/data/postgresql.conf.backup' + config_backup = '/var/lib/pgsql/{version}/data/postgresql.conf.org' else: - config_backup = '/etc/postgresql/{version}/main/postgresql.conf.backup' + config_backup = '/etc/postgresql/{version}/main/postgresql.conf.org' with host.sudo(): backup_file = config_backup.format(version=version) assert host.file(backup_file).is_file diff --git a/tasks/initialise.yml b/tasks/initialise.yml index 8702822..27d0a36 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -1,5 +1,6 @@ --- # tasks file for ome.postgresql +##Ansible managed - block: - name: postgres | set permissions on data directory @@ -25,7 +26,7 @@ - name: postgres | Check for presence of "Modified by ome postgresql ansible role" in file ansible.builtin.lineinfile: path: "{{ postgresql_dist_confdir }}/postgresql.conf" - line: "#Modified by ome postgresql ansible role" + line: "#Ansible managed" state: absent check_mode: yes changed_when: false @@ -33,9 +34,8 @@ - name: postgres | Check that the postgresql.conf.backup file exists ansible.builtin.stat: - path: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" - register: backup_result - + path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + register: org_file # read the default postgresql configuration file - name: postgres | get the postgres conf file contents @@ -44,34 +44,70 @@ src: "{{ postgresql_dist_confdir }}/postgresql.conf" register: postgres_config_file_contents_o when: - - not backup_result.stat.exists + - not org_file.stat.exists + + - name: Print the org_file.stat.exists + ansible.builtin.debug: + msg: + - System 1 {{ org_file.stat.exists }} and {{ config_file_changed.found }} + - "{{ postgresql_dist_confdir }}/postgresql.conf.org" + - "{{ postgresql_dist_redhat.conf_sample_file }}" + + - name: postgres | get the orginal configuration file + become_user: "{{ postgresql_become_user }}" + import_tasks: org_config_file.yml + when: + - not org_file.stat.exists + - config_file_changed.found + + - name: postgres | get the orginal configuration file + become_user: "{{ postgresql_become_user }}" + ansible.builtin.slurp: + src: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + register: postgres_config_file_contents_c + when: + - not org_file.stat.exists + - config_file_changed.found + # read the default postgresql configuration file - - name: postgres | get the postgres conf file contents from backup + - name: postgres | get the postgres conf file contents from org become_user: "{{ postgresql_become_user }}" ansible.builtin.slurp: - src: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" + src: "{{ postgresql_dist_confdir }}/postgresql.conf.org" register: postgres_config_file_contents_b - when: backup_result.stat.exists + when: org_file.stat.exists + - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_o }} when: - - not backup_result.stat.exists + - not org_file.stat.exists - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_b }} when: - - backup_result.stat.exists + - org_file.stat.exists - - name: postgres | Copy a postgresql.conf to postgresql.conf.backup + - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_c }} + when: + - not org_file.stat.exists + - config_file_changed.found + + - name: postgres | Copy a postgresql.conf to postgresql.conf.org become_user: "{{ postgresql_become_user }}" ansible.builtin.copy: src: "{{ postgresql_dist_confdir }}/postgresql.conf" - dest: "{{ postgresql_dist_confdir }}/postgresql.conf.backup" + dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" remote_src: yes when: - - not backup_result.stat.exists + - not org_file.stat.exists - config_file_changed.found | default(0) == 0 + - name: Print the org_file.stat.exists + ansible.builtin.debug: + msg: System {{ org_file.stat.exists }} and {{ config_file_changed.found }} + # when: + # - (not org_file.stat.exists and config_file_changed.found) or config_file_changed.found or org_file.stat.exists + - name: postgres | copy postgresql config file become_user: "{{ postgresql_become_user }}" ansible.builtin.template: @@ -82,8 +118,9 @@ owner: "{{ postgresql_become_user }}" notify: - restart postgresql - when: - - config_file_changed.found | default(0) == 0 or backup_result.stat.exists + when: (not org_file.stat.exists and config_file_changed.found) or not config_file_changed.found or org_file.stat.exists + # - not org_file.stat.exists + # - config_file_changed.found - name: postgres | configure client authorisation become_user: "{{ postgresql_become_user }}" diff --git a/tasks/org_config_file.yml b/tasks/org_config_file.yml new file mode 100644 index 0000000..7e68554 --- /dev/null +++ b/tasks/org_config_file.yml @@ -0,0 +1,45 @@ +--- +# get the original configuration file + +- name: postgres | Check that the postgresql.conf.sample file exists (ubuntu) + ansible.builtin.stat: + path: "{{ postgresql_dist_debian.conf_sample_file }}" + register: conf_sample_file + when: ansible_os_family | lower == 'debian' + +- name: postgres | postgres | Check that the postgresql.conf.sample file exists (redhat) + ansible.builtin.stat: + path: "{{ postgresql_dist_redhat.conf_sample_file }}" + register: conf_sample_file + when: ansible_os_family | lower == 'redhat' + +- name: postgres | copy the sample file to org + become_user: "{{ postgresql_become_user }}" + ansible.builtin.copy: + src: "{{ postgresql_dist_redhat.conf_sample_file }}" + dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + when: + - conf_sample_file.stat.exists + +- name: postgres | download the source code + ansible.builtin.get_url: + url: "{{ source_download_linnk }}" + dest: /tmp/postgresql.tar.gz + when: + - not conf_sample_file.stat.exists + +- name: postgres | extract the files + ansible.builtin.unarchive: + src: /tmp/postgresql.tar.gz + dest: /tmp + remote_src: yes + when: + - not conf_sample_file.stat.exists + +- name: postgres | copy the file to org file + become_user: "{{ postgresql_become_user }}" + ansible.builtin.copy: + src: "/tmp/postgresql-{{ versions_source_download [postgresql_version] }}/src/backend/utils/misc/postgresql.conf.sample" + dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + when: + - not conf_sample_file.stat.exists diff --git a/templates/postgresql-conf.j2 b/templates/postgresql-conf.j2 index 722eb7e..c5786b9 100644 --- a/templates/postgresql-conf.j2 +++ b/templates/postgresql-conf.j2 @@ -1,4 +1,4 @@ -#Modified by ome postgresql ansible role +#{{ ansible_managed }} {{ postgres_config_file_contents['content'] | b64decode | regex_replace('}$', '') }} listen_addresses = {{ postgresql_server_listen }} From 0879c9f083d561cb0cf9ed04f4fc12489a5a5cf9 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Tue, 11 Jun 2024 10:14:46 +0100 Subject: [PATCH 04/11] fix syntax error --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 3f7de38..185b20f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,7 +53,7 @@ postgresql_dist_redhat: (postgresql_package_version | length > 0) | ternary('-' + postgresql_package_version, '') }} - conf_sample_file: "/usr/pgsql-{{ postgresql_version }}/share/postgresql.conf.sample" + conf_sample_file: "/usr/pgsql-{{ postgresql_version }}/share/postgresql.conf.sample" # Attributes are parsed and used to set facts at tasks/debian.yml. # Debian variation, following the same principles of postgresql_dist_redhat From 9ee77fafe30d82f1d6ce3d4040042fd3b5cac3c3 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Tue, 11 Jun 2024 22:29:45 +0100 Subject: [PATCH 05/11] Clean up the code and set_facts --- tasks/initialise.yml | 65 ++++++-------------------------------------- 1 file changed, 9 insertions(+), 56 deletions(-) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index 27d0a36..e2069c3 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -23,7 +23,7 @@ PGSETUP_INITDB_OPTIONS: >- --encoding=UTF8 --locale=en_US.UTF-8 --auth-host=md5 - - name: postgres | Check for presence of "Modified by ome postgresql ansible role" in file + - name: postgres | check for presence of "Modified by ome postgresql ansible role" in file ansible.builtin.lineinfile: path: "{{ postgresql_dist_confdir }}/postgresql.conf" line: "#Ansible managed" @@ -32,27 +32,21 @@ changed_when: false register: config_file_changed - - name: postgres | Check that the postgresql.conf.backup file exists + - name: postgres | check that the postgresql.conf.backup file exists ansible.builtin.stat: path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" register: org_file - # read the default postgresql configuration file - - name: postgres | get the postgres conf file contents + - name: postgres | copy a postgresql.conf to postgresql.conf.org become_user: "{{ postgresql_become_user }}" - ansible.builtin.slurp: + ansible.builtin.copy: src: "{{ postgresql_dist_confdir }}/postgresql.conf" - register: postgres_config_file_contents_o + dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + remote_src: yes when: + - not config_file_changed.found - not org_file.stat.exists - - name: Print the org_file.stat.exists - ansible.builtin.debug: - msg: - - System 1 {{ org_file.stat.exists }} and {{ config_file_changed.found }} - - "{{ postgresql_dist_confdir }}/postgresql.conf.org" - - "{{ postgresql_dist_redhat.conf_sample_file }}" - - name: postgres | get the orginal configuration file become_user: "{{ postgresql_become_user }}" import_tasks: org_config_file.yml @@ -60,53 +54,14 @@ - not org_file.stat.exists - config_file_changed.found - - name: postgres | get the orginal configuration file - become_user: "{{ postgresql_become_user }}" - ansible.builtin.slurp: - src: "{{ postgresql_dist_confdir }}/postgresql.conf.org" - register: postgres_config_file_contents_c - when: - - not org_file.stat.exists - - config_file_changed.found - - # read the default postgresql configuration file - - name: postgres | get the postgres conf file contents from org + - name: postgres | get the postgres conf file contents become_user: "{{ postgresql_become_user }}" ansible.builtin.slurp: src: "{{ postgresql_dist_confdir }}/postgresql.conf.org" - register: postgres_config_file_contents_b - when: org_file.stat.exists - + register: postgres_config_file_contents_o - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_o }} - when: - - not org_file.stat.exists - - - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_b }} - when: - - org_file.stat.exists - - - set_fact: postgres_config_file_contents={{ postgres_config_file_contents_c }} - when: - - not org_file.stat.exists - - config_file_changed.found - - - name: postgres | Copy a postgresql.conf to postgresql.conf.org - become_user: "{{ postgresql_become_user }}" - ansible.builtin.copy: - src: "{{ postgresql_dist_confdir }}/postgresql.conf" - dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" - remote_src: yes - when: - - not org_file.stat.exists - - config_file_changed.found | default(0) == 0 - - - name: Print the org_file.stat.exists - ansible.builtin.debug: - msg: System {{ org_file.stat.exists }} and {{ config_file_changed.found }} - # when: - # - (not org_file.stat.exists and config_file_changed.found) or config_file_changed.found or org_file.stat.exists - name: postgres | copy postgresql config file become_user: "{{ postgresql_become_user }}" @@ -119,8 +74,6 @@ notify: - restart postgresql when: (not org_file.stat.exists and config_file_changed.found) or not config_file_changed.found or org_file.stat.exists - # - not org_file.stat.exists - # - config_file_changed.found - name: postgres | configure client authorisation become_user: "{{ postgresql_become_user }}" From 9790b98c177bd8ffe6acae7082909e570b49b438 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Wed, 12 Jun 2024 17:25:03 +0100 Subject: [PATCH 06/11] remove redundant check --- tasks/initialise.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index e2069c3..d6558ac 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -73,7 +73,6 @@ owner: "{{ postgresql_become_user }}" notify: - restart postgresql - when: (not org_file.stat.exists and config_file_changed.found) or not config_file_changed.found or org_file.stat.exists - name: postgres | configure client authorisation become_user: "{{ postgresql_become_user }}" From 743d5f3c64d67d05ba434364d28eb1e17260dee5 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Fri, 14 Jun 2024 12:20:58 +0100 Subject: [PATCH 07/11] Improve tasks name --- tasks/initialise.yml | 4 ++-- tasks/org_config_file.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index d6558ac..780a266 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -23,7 +23,7 @@ PGSETUP_INITDB_OPTIONS: >- --encoding=UTF8 --locale=en_US.UTF-8 --auth-host=md5 - - name: postgres | check for presence of "Modified by ome postgresql ansible role" in file + - name: postgres | check for presence of "#Ansible Managed" in file ansible.builtin.lineinfile: path: "{{ postgresql_dist_confdir }}/postgresql.conf" line: "#Ansible managed" @@ -32,7 +32,7 @@ changed_when: false register: config_file_changed - - name: postgres | check that the postgresql.conf.backup file exists + - name: postgres | check that the postgresql.conf.org file exists ansible.builtin.stat: path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" register: org_file diff --git a/tasks/org_config_file.yml b/tasks/org_config_file.yml index 7e68554..2f4d0ab 100644 --- a/tasks/org_config_file.yml +++ b/tasks/org_config_file.yml @@ -7,7 +7,7 @@ register: conf_sample_file when: ansible_os_family | lower == 'debian' -- name: postgres | postgres | Check that the postgresql.conf.sample file exists (redhat) +- name: postgres | Check that the postgresql.conf.sample file exists (redhat) ansible.builtin.stat: path: "{{ postgresql_dist_redhat.conf_sample_file }}" register: conf_sample_file From dcaa4eba483ba1c73d8a08771d51cb605a3f228f Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Thu, 27 Jun 2024 19:54:04 +0100 Subject: [PATCH 08/11] clean up the configuration file and copy to org in case of org is not found --- defaults/main.yml | 11 +--------- tasks/initialise.yml | 30 +++++++++++--------------- tasks/org_config_file.yml | 45 --------------------------------------- 3 files changed, 14 insertions(+), 72 deletions(-) delete mode 100644 tasks/org_config_file.yml diff --git a/defaults/main.yml b/defaults/main.yml index 185b20f..7671aee 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -52,8 +52,7 @@ postgresql_dist_redhat: {{ (postgresql_package_version | length > 0) | ternary('-' + postgresql_package_version, '') - }} - conf_sample_file: "/usr/pgsql-{{ postgresql_version }}/share/postgresql.conf.sample" + }} # Attributes are parsed and used to set facts at tasks/debian.yml. # Debian variation, following the same principles of postgresql_dist_redhat @@ -63,17 +62,9 @@ postgresql_dist_debian: conf_postgresql_src: postgresql-conf.j2 datadir: /var/lib/postgresql/{{ postgresql_version }}/main basename: postgresql-{{ postgresql_version }} - conf_sample_file: "/usr/share/postgresql/{{ postgresql_version }}/postgresql.conf.sample" service: postgresql # conf_sample_file: sample configuration file, it should be copied during the installation by the installation package # the following two variables are used to download link ofr the source to get the sample configuration file # It will be used in case of the sample file is not find locally for any reason -versions_source_download: - 13: "13.15" - 14: "14.12" - 15: "15.7" - 16: "16.3" - -source_download_linnk: "https://ftp.postgresql.org/pub/source/v{{ versions_source_download [postgresql_version] }}/postgresql-{{ versions_source_download [postgresql_version] }}.tar.gz" diff --git a/tasks/initialise.yml b/tasks/initialise.yml index 780a266..ad707fd 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -23,36 +23,32 @@ PGSETUP_INITDB_OPTIONS: >- --encoding=UTF8 --locale=en_US.UTF-8 --auth-host=md5 - - name: postgres | check for presence of "#Ansible Managed" in file - ansible.builtin.lineinfile: - path: "{{ postgresql_dist_confdir }}/postgresql.conf" - line: "#Ansible managed" - state: absent - check_mode: yes - changed_when: false - register: config_file_changed - - name: postgres | check that the postgresql.conf.org file exists ansible.builtin.stat: path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" register: org_file + - name: postgres | remove the custom configurations from the file, if any + command: sed -i '/# Add settings for extensions here/q' "{{ postgresql_dist_confdir }}/postgresql.conf" + when: + - not org_file.stat.exists + + - name: postgres | remove the Ansible managed line, if any + ansible.builtin.lineinfile: + path: "{{ postgresql_dist_confdir }}/postgresql.conf" + regexp: "#Ansible managed" + state: absent + when: + - not org_file.stat.exists + - name: postgres | copy a postgresql.conf to postgresql.conf.org become_user: "{{ postgresql_become_user }}" ansible.builtin.copy: src: "{{ postgresql_dist_confdir }}/postgresql.conf" dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" remote_src: yes - when: - - not config_file_changed.found - - not org_file.stat.exists - - - name: postgres | get the orginal configuration file - become_user: "{{ postgresql_become_user }}" - import_tasks: org_config_file.yml when: - not org_file.stat.exists - - config_file_changed.found # read the default postgresql configuration file - name: postgres | get the postgres conf file contents diff --git a/tasks/org_config_file.yml b/tasks/org_config_file.yml deleted file mode 100644 index 2f4d0ab..0000000 --- a/tasks/org_config_file.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -# get the original configuration file - -- name: postgres | Check that the postgresql.conf.sample file exists (ubuntu) - ansible.builtin.stat: - path: "{{ postgresql_dist_debian.conf_sample_file }}" - register: conf_sample_file - when: ansible_os_family | lower == 'debian' - -- name: postgres | Check that the postgresql.conf.sample file exists (redhat) - ansible.builtin.stat: - path: "{{ postgresql_dist_redhat.conf_sample_file }}" - register: conf_sample_file - when: ansible_os_family | lower == 'redhat' - -- name: postgres | copy the sample file to org - become_user: "{{ postgresql_become_user }}" - ansible.builtin.copy: - src: "{{ postgresql_dist_redhat.conf_sample_file }}" - dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" - when: - - conf_sample_file.stat.exists - -- name: postgres | download the source code - ansible.builtin.get_url: - url: "{{ source_download_linnk }}" - dest: /tmp/postgresql.tar.gz - when: - - not conf_sample_file.stat.exists - -- name: postgres | extract the files - ansible.builtin.unarchive: - src: /tmp/postgresql.tar.gz - dest: /tmp - remote_src: yes - when: - - not conf_sample_file.stat.exists - -- name: postgres | copy the file to org file - become_user: "{{ postgresql_become_user }}" - ansible.builtin.copy: - src: "/tmp/postgresql-{{ versions_source_download [postgresql_version] }}/src/backend/utils/misc/postgresql.conf.sample" - dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" - when: - - not conf_sample_file.stat.exists From 81515084f5522bdedfbeb2b50b5a9c6de812c0d8 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Sun, 7 Jul 2024 10:39:10 +0100 Subject: [PATCH 09/11] Fix check mode orginal file issue --- tasks/initialise.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index ad707fd..e48367b 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -47,6 +47,7 @@ src: "{{ postgresql_dist_confdir }}/postgresql.conf" dest: "{{ postgresql_dist_confdir }}/postgresql.conf.org" remote_src: yes + check_mode: false when: - not org_file.stat.exists @@ -70,6 +71,15 @@ notify: - restart postgresql + - name: postgres | Remove org config file in check mode and file does not exist + ansible.builtin.file: + path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" + state: absent + check_mode: false + when: + - not org_file.stat.exists + - ansible_check_mode + - name: postgres | configure client authorisation become_user: "{{ postgresql_become_user }}" template: From 5b1c41a6c2ed1d723366e03774b70b2421b14bbb Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Sun, 7 Jul 2024 11:32:21 +0100 Subject: [PATCH 10/11] clean up the code --- defaults/main.yml | 5 ----- tasks/initialise.yml | 1 - 2 files changed, 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 7671aee..055bbe3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -63,8 +63,3 @@ postgresql_dist_debian: datadir: /var/lib/postgresql/{{ postgresql_version }}/main basename: postgresql-{{ postgresql_version }} service: postgresql - -# conf_sample_file: sample configuration file, it should be copied during the installation by the installation package - -# the following two variables are used to download link ofr the source to get the sample configuration file -# It will be used in case of the sample file is not find locally for any reason diff --git a/tasks/initialise.yml b/tasks/initialise.yml index e48367b..0056a1c 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -1,6 +1,5 @@ --- # tasks file for ome.postgresql -##Ansible managed - block: - name: postgres | set permissions on data directory From bc2b2ad49832ddc7fe0a24c8f4de1db153e98dc5 Mon Sep 17 00:00:00 2001 From: khaledk2 Date: Wed, 24 Jul 2024 00:29:07 +0100 Subject: [PATCH 11/11] Update task name to address Petr's comment --- tasks/initialise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/initialise.yml b/tasks/initialise.yml index 0056a1c..7663081 100644 --- a/tasks/initialise.yml +++ b/tasks/initialise.yml @@ -70,7 +70,7 @@ notify: - restart postgresql - - name: postgres | Remove org config file in check mode and file does not exist + - name: postgres | Remove the org config file if it runs in a check mode and the org file does not exist in the host ansible.builtin.file: path: "{{ postgresql_dist_confdir }}/postgresql.conf.org" state: absent