From 062c0b9c6c8400be26497beae5b75880f464023d Mon Sep 17 00:00:00 2001 From: jonnybravo Date: Wed, 18 Oct 2023 20:19:31 +0200 Subject: [PATCH] fix error --- gitlab/roles/docker_gitlab/tasks/main.yml | 6 +++--- gitlab/roles/prereq_gitlab/defaults/main.yml | 9 +-------- gitlab/roles/prereq_gitlab/handlers/main.yml | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gitlab/roles/docker_gitlab/tasks/main.yml b/gitlab/roles/docker_gitlab/tasks/main.yml index 582d101..e0bb98d 100755 --- a/gitlab/roles/docker_gitlab/tasks/main.yml +++ b/gitlab/roles/docker_gitlab/tasks/main.yml @@ -15,12 +15,12 @@ openssl_csr: path: "{{gitlab_dir[4]}}/gitlab.csr" privatekey_path: "{{gitlab_dir[4]}}/gitlab.key" - common_name: gitlab.man-dan-03 + #common_name: "{{ansible_hostname}" + common_name: man-dan-03 subject_alt_name: "{{ item.value | map('regex_replace', '^', 'DNS:') | list }}" with_dict: dns_server: - #- j337114.servers.jiffybox.net - #- "{{ansible_hostname}}" + #- "{{ansible_hostname}}" - "man-dan-03" - name: Generate a Self Signed OpenSSL certificate diff --git a/gitlab/roles/prereq_gitlab/defaults/main.yml b/gitlab/roles/prereq_gitlab/defaults/main.yml index 0d262d1..73b314f 100755 --- a/gitlab/roles/prereq_gitlab/defaults/main.yml +++ b/gitlab/roles/prereq_gitlab/defaults/main.yml @@ -1,8 +1 @@ ---- -# defaults file for roles/prereq-portainer -# portainer direcotorys - -#portainer_dir: -# - "/home/{{ansible_user}}/.portainer" -# - "/home/{{ansible_user}}/.portainer/cert" -# - "/home/{{ansible_user}}/.portainer/data" \ No newline at end of file +--- \ No newline at end of file diff --git a/gitlab/roles/prereq_gitlab/handlers/main.yml b/gitlab/roles/prereq_gitlab/handlers/main.yml index 3134f95..ed97d53 100755 --- a/gitlab/roles/prereq_gitlab/handlers/main.yml +++ b/gitlab/roles/prereq_gitlab/handlers/main.yml @@ -1,2 +1 @@ --- -# handlers file for roles/prereq-portainer