From 68a791ef091114b081f71631d94201a9f1ed07b6 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Thu, 25 Jun 2020 14:35:50 +0300 Subject: [PATCH 1/7] fix(contributing): runnig formula inside container --- postgres/codenamemap.yaml | 1 + postgres/defaults.yaml | 1 + postgres/server/image.sls | 12 ++++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 078d181..0b022a8 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -35,6 +35,7 @@ prepare_cluster: pgcommand: pg_createcluster {{ version }} {{ cluster_name }} -d user: root + bake_image_run_cmd: pg_ctlcluster {{ version }} {{ cluster_name }} start {% endmacro %} diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml index 79c03be..a44ca36 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -76,6 +76,7 @@ postgres: sysrc: false bake_image: false + bake_image_run_cmd: echo "do nothing by default" fromrepo: '' diff --git a/postgres/server/image.sls b/postgres/server/image.sls index 67b2411..75bd8d9 100644 --- a/postgres/server/image.sls +++ b/postgres/server/image.sls @@ -10,15 +10,19 @@ include: # An attempt to start PostgreSQL with `pg_ctl` -postgresql-start: +postgresql-running: cmd.run: - - name: pg_ctl -D {{ postgres.data_dir }} -l logfile start + - name: {{ postgres.bake_image_run_cmd }} - runas: {{ postgres.user }} - unless: - ps -p $(head -n 1 {{ postgres.data_dir }}/postmaster.pid) 2>/dev/null - require: - file: postgresql-pg_hba +postgresql-service-reload: + test.show_notification: + - text: Imitating reload while baking an image + # Try to enable PostgreSQL in "manual" way postgresql-enable: @@ -34,11 +38,11 @@ postgresql-enable: - name: 'true' {%- endif %} - require: - - cmd: postgresql-start + - cmd: postgresql-running {%- else %} -postgresql-start: +postgresql-running: test.show_notification: - text: The 'postgres:bake_image' Pillar is disabled (set to 'False'). From 69b57e3b69062d0b66bd9fb28e3769a9ff579faa Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Sat, 4 Jul 2020 17:46:33 +0300 Subject: [PATCH 2/7] fix(contributing): postgresql-repo state ID requires python3-apt package --- postgres/defaults.yaml | 3 ++- postgres/init.sls | 1 + postgres/osfamilymap.yaml | 1 + postgres/server/image.sls | 10 ---------- postgres/server/init.sls | 3 --- postgres/upstream.sls | 5 +++++ 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml index a44ca36..63af504 100644 --- a/postgres/defaults.yaml +++ b/postgres/defaults.yaml @@ -9,6 +9,7 @@ postgres: version: '10' pkg: postgresql pkgs_extra: [] + pkgs_deps: [] pkg_client: postgresql-client pkg_dev: postgresql-devel pkg_dev_deps: [] @@ -76,7 +77,7 @@ postgres: sysrc: false bake_image: false - bake_image_run_cmd: echo "do nothing by default" + bake_image_run_cmd: pg_ctl start fromrepo: '' diff --git a/postgres/init.sls b/postgres/init.sls index a28a0ed..4cebb32 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -4,6 +4,7 @@ include: - postgres.macos {% else %} - postgres.server + - postgres.server.image - postgres.client - postgres.manage {% endif %} diff --git a/postgres/osfamilymap.yaml b/postgres/osfamilymap.yaml index bde79cc..8933ce6 100644 --- a/postgres/osfamilymap.yaml +++ b/postgres/osfamilymap.yaml @@ -12,6 +12,7 @@ Arch: pkg_dev: postgresql Debian: + pkgs_deps: ['python3-apt'] pkg_repo: humanname: PostgreSQL Official Repository key_url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' diff --git a/postgres/server/image.sls b/postgres/server/image.sls index 75bd8d9..72c91b0 100644 --- a/postgres/server/image.sls +++ b/postgres/server/image.sls @@ -5,11 +5,7 @@ {%- if postgres.bake_image %} -include: - - postgres.server - # An attempt to start PostgreSQL with `pg_ctl` - postgresql-running: cmd.run: - name: {{ postgres.bake_image_run_cmd }} @@ -40,10 +36,4 @@ postgresql-enable: - require: - cmd: postgresql-running -{%- else %} - -postgresql-running: - test.show_notification: - - text: The 'postgres:bake_image' Pillar is disabled (set to 'False'). - {%- endif %} diff --git a/postgres/server/init.sls b/postgres/server/init.sls index ce1d575..0a66e93 100644 --- a/postgres/server/init.sls +++ b/postgres/server/init.sls @@ -1,9 +1,6 @@ {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%} {%- set includes = [] %} -{%- if postgres.bake_image %} - {%- do includes.append('postgres.server.image') %} -{%- endif %} {%- if postgres.use_upstream_repo == true -%} {%- do includes.append('postgres.upstream') %} {%- endif %} diff --git a/postgres/upstream.sls b/postgres/upstream.sls index f38c96e..44e7f9d 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -17,6 +17,11 @@ postgresql-profile: - defaults: bin_dir: {{ postgres.bin_dir }} {%- endif %} + +postgresql-pkg-deps: + pkg.installed: + - pkgs: {{ postgres.pkgs_deps }} + # Add upstream repository for your distro postgresql-repo: pkgrepo.managed: From 8592ed02a050510b8924cd0719d8f0c6bd753b19 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 26 Jun 2020 12:46:35 +0100 Subject: [PATCH 3/7] chore(gemfile.lock): update to latest gem versions (2020-W26) [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/233 --- Gemfile.lock | 112 +++++++++++++++++++++++++-------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 218dff4..969e3a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,155 +9,155 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.332.0) - aws-sdk-apigateway (1.46.0) + aws-partitions (1.335.0) + aws-sdk-apigateway (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-apigatewayv2 (1.22.1) + aws-sdk-apigatewayv2 (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.28.1) + aws-sdk-athena (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) aws-sdk-core (~> 3, >= 3.52.1) aws-sigv4 (~> 1.1) - aws-sdk-budgets (1.31.1) + aws-sdk-budgets (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.38.0) + aws-sdk-cloudformation (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.31.0) + aws-sdk-cloudfront (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsm (1.23.1) + aws-sdk-cloudhsm (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.24.1) + aws-sdk-cloudhsmv2 (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.24.1) + aws-sdk-cloudtrail (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.39.1) + aws-sdk-cloudwatch (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.32.1) + aws-sdk-cloudwatchlogs (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.34.1) + aws-sdk-codecommit (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.32.1) + aws-sdk-codedeploy (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.32.1) + aws-sdk-codepipeline (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.46.1) + aws-sdk-configservice (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.100.0) + aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.22.1) + aws-sdk-costandusagereportservice (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.49.1) + aws-sdk-dynamodb (1.50.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.168.0) + aws-sdk-ec2 (1.171.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.31.1) + aws-sdk-ecr (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.65.0) + aws-sdk-ecs (1.66.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.30.1) + aws-sdk-efs (1.31.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-eks (1.38.1) + aws-sdk-eks (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.38.0) + aws-sdk-elasticache (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.32.1) + aws-sdk-elasticbeanstalk (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.23.1) + aws-sdk-elasticloadbalancing (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.45.1) + aws-sdk-elasticloadbalancingv2 (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.37.1) + aws-sdk-elasticsearchservice (1.38.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.29.1) + aws-sdk-firehose (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.40.1) + aws-sdk-iam (1.42.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kafka (1.22.1) + aws-sdk-kafka (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.24.1) + aws-sdk-kinesis (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.34.1) + aws-sdk-kms (1.35.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.44.0) + aws-sdk-lambda (1.45.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.87.0) + aws-sdk-rds (1.89.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.44.1) + aws-sdk-redshift (1.45.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.38.0) + aws-sdk-route53 (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.23.1) + aws-sdk-route53domains (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.15.1) + aws-sdk-route53resolver (1.16.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.69.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-s3 (1.71.1) + aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.27.1) + aws-sdk-securityhub (1.28.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.31.1) + aws-sdk-ses (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.21.1) + aws-sdk-sms (1.22.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.25.1) + aws-sdk-sns (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.27.1) + aws-sdk-sqs (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.82.0) + aws-sdk-ssm (1.83.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.0) + aws-sigv4 (1.2.1) aws-eventstream (~> 1, >= 1.0.2) azure_graph_rbac (0.17.2) ms_rest_azure (~> 0.12.0) @@ -171,9 +171,9 @@ GEM ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.2.44) + chef-config (16.2.50) addressable - chef-utils (= 16.2.44) + chef-utils (= 16.2.50) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -182,12 +182,12 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.2.44) + chef-utils (16.2.50) coderay (1.1.3) concurrent-ruby (1.1.6) declarative (0.0.10) declarative-option (0.1.0) - diff-lcs (1.3) + diff-lcs (1.4.2) docker-api (1.34.2) excon (>= 0.47.0) multi_json @@ -398,7 +398,7 @@ GEM tins (1.25.0) sync tomlrb (1.2.9) - train (3.3.1) + train (3.3.4) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -409,7 +409,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.3.1) + train-core (= 3.3.4) train-winrm (~> 0.2) train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) @@ -460,7 +460,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.1) + train-core (3.3.4) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 278893c2f0f3fa8db26b45b3874f7dd7177b714a Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Sat, 4 Jul 2020 18:24:30 +0300 Subject: [PATCH 4/7] fix(contributing): postgresql-service-reload type --- postgres/server/image.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/postgres/server/image.sls b/postgres/server/image.sls index 72c91b0..d70ee21 100644 --- a/postgres/server/image.sls +++ b/postgres/server/image.sls @@ -16,8 +16,8 @@ postgresql-running: - file: postgresql-pg_hba postgresql-service-reload: - test.show_notification: - - text: Imitating reload while baking an image + module.run: + - name: test.true # Try to enable PostgreSQL in "manual" way From 07044bf7c1d420855b43d6add30358ff39666702 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Mon, 6 Jul 2020 18:24:52 +0300 Subject: [PATCH 5/7] fix(postgres.server): reverted how posrgre.server.image is included --- postgres/init.sls | 1 - postgres/server/image.sls | 2 ++ postgres/server/init.sls | 3 +++ postgres/upstream.sls | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/postgres/init.sls b/postgres/init.sls index 4cebb32..a28a0ed 100644 --- a/postgres/init.sls +++ b/postgres/init.sls @@ -4,7 +4,6 @@ include: - postgres.macos {% else %} - postgres.server - - postgres.server.image - postgres.client - postgres.manage {% endif %} diff --git a/postgres/server/image.sls b/postgres/server/image.sls index d70ee21..2de0886 100644 --- a/postgres/server/image.sls +++ b/postgres/server/image.sls @@ -18,6 +18,8 @@ postgresql-running: postgresql-service-reload: module.run: - name: test.true + - require: + - cmd: postgresql-running # Try to enable PostgreSQL in "manual" way diff --git a/postgres/server/init.sls b/postgres/server/init.sls index 0a66e93..ce1d575 100644 --- a/postgres/server/init.sls +++ b/postgres/server/init.sls @@ -1,6 +1,9 @@ {%- from salt.file.dirname(tpldir) ~ "/map.jinja" import postgres with context -%} {%- set includes = [] %} +{%- if postgres.bake_image %} + {%- do includes.append('postgres.server.image') %} +{%- endif %} {%- if postgres.use_upstream_repo == true -%} {%- do includes.append('postgres.upstream') %} {%- endif %} diff --git a/postgres/upstream.sls b/postgres/upstream.sls index 44e7f9d..0fe9ff9 100644 --- a/postgres/upstream.sls +++ b/postgres/upstream.sls @@ -26,6 +26,8 @@ postgresql-pkg-deps: postgresql-repo: pkgrepo.managed: {{- format_kwargs(postgres.pkg_repo) }} + - require: + - pkg: postgresql-pkg-deps {%- else -%} From 2b10e6225f38b0813f18840448eec714ec0816f2 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Mon, 6 Jul 2020 18:39:46 +0300 Subject: [PATCH 6/7] chore(upstream): merge Gemfile.lock with upstream --- Gemfile.lock | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 969e3a7..de60746 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,14 +9,14 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.1.0) - aws-partitions (1.335.0) - aws-sdk-apigateway (1.47.0) + aws-partitions (1.338.0) + aws-sdk-apigateway (1.48.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-apigatewayv2 (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-athena (1.29.0) + aws-sdk-athena (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-autoscaling (1.22.0) @@ -25,136 +25,136 @@ GEM aws-sdk-budgets (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudformation (1.39.0) + aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudfront (1.32.0) + aws-sdk-cloudfront (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-cloudhsm (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudhsmv2 (1.25.0) + aws-sdk-cloudhsmv2 (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudtrail (1.25.0) + aws-sdk-cloudtrail (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatch (1.40.0) + aws-sdk-cloudwatch (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-cloudwatchlogs (1.33.0) + aws-sdk-cloudwatchlogs (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codecommit (1.36.0) + aws-sdk-codecommit (1.37.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codedeploy (1.33.0) + aws-sdk-codedeploy (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-codepipeline (1.33.0) + aws-sdk-codepipeline (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-configservice (1.47.0) + aws-sdk-configservice (1.48.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.102.1) + aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-costandusagereportservice (1.23.0) + aws-sdk-costandusagereportservice (1.24.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-dynamodb (1.50.0) + aws-sdk-dynamodb (1.51.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2 (1.171.0) + aws-sdk-ec2 (1.174.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecr (1.32.0) + aws-sdk-ecr (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ecs (1.66.0) + aws-sdk-ecs (1.67.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-efs (1.31.0) + aws-sdk-efs (1.32.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-eks (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticache (1.39.0) + aws-sdk-elasticache (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticbeanstalk (1.33.0) + aws-sdk-elasticbeanstalk (1.34.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancing (1.24.0) + aws-sdk-elasticloadbalancing (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticloadbalancingv2 (1.46.0) + aws-sdk-elasticloadbalancingv2 (1.47.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-elasticsearchservice (1.38.0) + aws-sdk-elasticsearchservice (1.39.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-firehose (1.30.0) + aws-sdk-firehose (1.31.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.42.0) + aws-sdk-iam (1.43.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-kafka (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kinesis (1.25.0) + aws-sdk-kinesis (1.26.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.35.0) + aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-lambda (1.45.0) + aws-sdk-lambda (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sdk-organizations (1.17.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-rds (1.89.0) + aws-sdk-rds (1.92.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-redshift (1.45.0) + aws-sdk-redshift (1.46.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53 (1.39.0) + aws-sdk-route53 (1.40.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53domains (1.24.0) + aws-sdk-route53domains (1.25.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-route53resolver (1.16.0) + aws-sdk-route53resolver (1.17.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.71.1) + aws-sdk-s3 (1.73.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-securityhub (1.28.0) + aws-sdk-securityhub (1.29.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ses (1.32.0) + aws-sdk-ses (1.33.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sms (1.22.0) + aws-sdk-sms (1.23.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.26.0) + aws-sdk-sns (1.27.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-sqs (1.29.0) + aws-sdk-sqs (1.30.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-ssm (1.83.0) + aws-sdk-ssm (1.84.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.1) @@ -167,13 +167,13 @@ GEM ms_rest_azure (~> 0.12.0) azure_mgmt_security (0.18.2) ms_rest_azure (~> 0.12.0) - azure_mgmt_storage (0.21.1) + azure_mgmt_storage (0.21.2) ms_rest_azure (~> 0.12.0) bcrypt_pbkdf (1.0.1) builder (3.2.4) - chef-config (16.2.50) + chef-config (16.2.73) addressable - chef-utils (= 16.2.50) + chef-utils (= 16.2.73) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -182,12 +182,12 @@ GEM chef-config concurrent-ruby (~> 1.0) ffi-yajl (~> 2.2) - chef-utils (16.2.50) + chef-utils (16.2.73) coderay (1.1.3) concurrent-ruby (1.1.6) - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) - diff-lcs (1.4.2) + diff-lcs (1.4.4) docker-api (1.34.2) excon (>= 0.47.0) multi_json @@ -238,14 +238,14 @@ GEM i18n (1.8.3) concurrent-ruby (~> 1.0) inifile (3.0.0) - inspec (4.20.10) + inspec (4.21.3) faraday_middleware (~> 0.12.2) - inspec-core (= 4.20.10) + inspec-core (= 4.21.3) train (~> 3.0) train-aws (~> 0.1) train-habitat (~> 0.1) train-winrm (~> 0.2) - inspec-core (4.20.10) + inspec-core (4.21.3) addressable (~> 2.4) chef-telemetry (~> 1.0) faraday (>= 0.9.0) @@ -271,7 +271,7 @@ GEM tty-prompt (~> 0.17) tty-table (~> 0.10) jmespath (1.4.0) - json (2.3.0) + json (2.3.1) json_schemer (0.2.11) ecma-re-validator (~> 0.2) hana (~> 1.3) @@ -296,9 +296,9 @@ GEM tty-box (~> 0.3) tty-prompt (~> 0.18) little-plugger (1.1.4) - logging (2.2.2) + logging (2.3.0) little-plugger (~> 1.1) - multi_json (~> 1.10) + multi_json (~> 1.14) memoist (0.16.2) method_source (1.0.0) mini_mime (1.0.2) @@ -398,7 +398,7 @@ GEM tins (1.25.0) sync tomlrb (1.2.9) - train (3.3.4) + train (3.3.6) activesupport (>= 5.2.4.3, < 6.0.0) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) @@ -409,7 +409,7 @@ GEM google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) inifile (~> 3.0) - train-core (= 3.3.4) + train-core (= 3.3.6) train-winrm (~> 0.2) train-aws (0.1.17) aws-sdk-apigateway (~> 1.0) @@ -460,7 +460,7 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.3.4) + train-core (3.3.6) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) From 904a5258cd155f3b5a83ec8dc8e990a8ffc6b798 Mon Sep 17 00:00:00 2001 From: LitniAlex Date: Mon, 6 Jul 2020 21:30:21 +0300 Subject: [PATCH 7/7] docs(container): "postgres:bake_image" specifics --- docs/README.rst | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/docs/README.rst b/docs/README.rst index e271e7a..ab98b40 100644 --- a/docs/README.rst +++ b/docs/README.rst @@ -83,31 +83,15 @@ packaged init script, job or unit. Further information: https://blog.tyk.nu/blog/freebsd-jails-and-sysv-ipc/ -``postgres.server.image`` -^^^^^^^^^^^^^^^^^^^^^^^^^ - -Installs the PostgreSQL server package on Linux, prepares the DB cluster and starts the server by issuing -raw ``pg_ctl`` command. The ``postgres:bake_image`` Pillar toggles this behaviour. For example: +**Running inside a container** (using Packer, Docker or similar tools), when OS ``init`` process +is not available to start the service and enable it on "boot", set pillar value: .. code:: yaml postgres: bake_image: True -If set ``True``, then it becomes possible to fully provision PostgreSQL with all supported entities -from ``postgres.manage`` state during the build ("baking") of AMI / VM / Container images (using -Packer, Docker or similar tools), i.e. when OS ``init`` process is not available to start the -service and enable it on "boot" of resulting appliance. - -Also it allows to make Docker images with PostgreSQL using functionality being available since Salt -2016.11.0 release: - -.. code:: console - - salt 'minion.with.docker' dockerng.sls_build my-postgres base=centos/systemd mods=postgres - -If a lookup dictionary or Pillar has ``postgres:bake_image`` set ``False`` (this is default), it is -equivalent of applying ``postgres.server`` state. +This toggles starting PostgreSQL daemon by issuing raw ``pg_ctl`` or ``pg_ctlcluster`` command. ``postgres.upstream`` ^^^^^^^^^^^^^^^^^^^^^