Skip to content
Snippets Groups Projects
Commit 8b20f9d3 authored by Antoine SCHILDKNECHT's avatar Antoine SCHILDKNECHT
Browse files

Merge branch 't36656-certbot-hook' into 'main'

Remove useless nginx test in post-hook | refs #36656

See merge request sys/ansible-public!27
parents 110c87ff fbe17dcb
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 73 deletions
--- ---
checkpf: checkpf:
# https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html # https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html
trigger: trigger:
...@@ -7,21 +6,21 @@ checkpf: ...@@ -7,21 +6,21 @@ checkpf:
strategy: depend strategy: depend
# Sends the current branch to the ubicast-environment triggered pipeline as a variable # Sends the current branch to the ubicast-environment triggered pipeline as a variable
variables: variables:
ANSIBLE_BRANCH: "$CI_COMMIT_BRANCH" ANSIBLE_BRANCH: $CI_COMMIT_BRANCH
DEPLOY_STD: "$DEPLOY_STD" DEPLOY_STD: $DEPLOY_STD
DEPLOY_HA: "$DEPLOY_HA" DEPLOY_HA: $DEPLOY_HA
DESTROY_STD: "$DESTROY_STD" DESTROY_STD: $DESTROY_STD
DESTROY_HA: "$DESTROY_HA" DESTROY_HA: $DESTROY_HA
LINT: "$LINT" LINT: $LINT
# Register the job in a resource group to prevent having multiple running pipelines in parallel # Register the job in a resource group to prevent having multiple running pipelines in parallel
resource_group: deployment resource_group: deployment
rules: rules:
# Only triggers the pipeline if it's launched manually from the GitLab webinterface # Only triggers the pipeline if it's launched manually from the GitLab webinterface
- if: '$CI_PIPELINE_SOURCE == "web"' - if: $CI_PIPELINE_SOURCE == "web"
# Only triggers the pipeline if it's launched by a scheduled job # Only triggers the pipeline if it's launched by a scheduled job
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: $CI_PIPELINE_SOURCE == "schedule"
# Only if push on the main branch # Only if push on the main branch
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main"' - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main"
lint: lint:
# https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html # https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html
...@@ -30,12 +29,10 @@ lint: ...@@ -30,12 +29,10 @@ lint:
strategy: depend strategy: depend
# Sends the current branch to the ubicast-environment triggered pipeline as a variable # Sends the current branch to the ubicast-environment triggered pipeline as a variable
variables: variables:
ANSIBLE_BRANCH: "$CI_COMMIT_BRANCH" ANSIBLE_BRANCH: $CI_COMMIT_BRANCH
DEPLOY_STD: "false" DEPLOY_STD: "false"
DEPLOY_HA: "false" DEPLOY_HA: "false"
resource_group: deployment resource_group: deployment
rules: rules:
# Only if push in a branch other than main # Only if push in a branch other than main
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"' - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"
...
...@@ -5,9 +5,13 @@ exclude_paths: ...@@ -5,9 +5,13 @@ exclude_paths:
- ${HOME}/.cache/ - ${HOME}/.cache/
skip_list: skip_list:
- meta-no-info # Skip warnings for missing galaxy_info in roles - meta-no-info # Skip warnings for missing galaxy_info in roles
- role-name # Skip role name pattern verification ("-" should not be used) - role-name # Skip role name pattern verification ("-" should not be used)
- package-latest # Skip warning when package installation state is set to latest - package-latest # Skip warning when package installation state is set to latest
- experimental # Skip all rules tagged as experimental, as schema validation - experimental # Skip all rules tagged as experimental, as schema validation
- name[play] # Skip the rule dictating that all play should have a name
- name[casing] # Skip the rule dictating that all task name should begin with uppercase
- template-instead-of-copy # Skip forcing the use of templates
- name[template] # Skip forcing to use jinja var at the end of a task name
... ...
--- ---
# customer name # customer name
customer_short_name: customer customer_short_name: customer
...@@ -16,7 +15,7 @@ repmgr_primary_node: "{{ hostvars['pg1']['ansible_default_ipv4']['address'] }}" ...@@ -16,7 +15,7 @@ repmgr_primary_node: "{{ hostvars['pg1']['ansible_default_ipv4']['address'] }}"
# ha proxy configuration # ha proxy configuration
hap_config_listen: hap_config_listen:
- name: pgsql-primary - name: pgsql-primary
content: |2 content: |
bind localhost:54321 bind localhost:54321
default-server inter 2s fall 3 rise 2 on-marked-down shutdown-sessions default-server inter 2s fall 3 rise 2 on-marked-down shutdown-sessions
option tcp-check option tcp-check
...@@ -24,5 +23,3 @@ hap_config_listen: ...@@ -24,5 +23,3 @@ hap_config_listen:
maxconn 500 maxconn 500
server pg1 192.168.122.1:5432 maxconn 500 check port 8543 server pg1 192.168.122.1:5432 maxconn 500 check port 8543
server pg2 192.168.122.2:5432 maxconn 500 check port 8543 backup server pg2 192.168.122.2:5432 maxconn 500 check port 8543 backup
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
db_role: primary db_role: primary
repmgr_node_id: 1 repmgr_node_id: 1
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
db_role: standby db_role: standby
repmgr_node_id: 2 repmgr_node_id: 2
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
db_role: witness db_role: witness
repmgr_node_id: 3 repmgr_node_id: 3
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
# customer name # customer name
customer_short_name: customer customer_short_name: customer
...@@ -8,5 +7,3 @@ letsencrypt_enabled: false ...@@ -8,5 +7,3 @@ letsencrypt_enabled: false
# update conf.sh # update conf.sh
conf_update: false conf_update: false
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
--- ---
skyreach_system_key: changeme skyreach_system_key: changeme
...
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment