From 2e58dc057086f9519c54fec8e813346514f1498a Mon Sep 17 00:00:00 2001
From: mg <michael.grote@posteo.de>
Date: Fri, 29 Jan 2021 12:45:33 +0100
Subject: [PATCH] Bugfix: pipeline

---
 .gitlab-ci.yml              |  5 ++++-
 group_vars/gitlabrunner.yml | 13 +++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 868cbfcc..c736b332 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,9 @@ stages:
   - deploy-dry
   - deploy
 
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
 ansible-lint:
   image: willhallonline/ansible:2.9-ubuntu-20.04
   stage: lint
@@ -34,7 +37,7 @@ ansible-deploy-dry:
     - echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user
     - chmod 0400 /builds/mg/ansible/id_rsa_ansible_user
   script:
-    - ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --check --limit production --vault-password-file $ansible_vault_pass
+    - ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --check --limit test --vault-password-file $ansible_vault_pass
   after_script:
     - rm /builds/mg/ansible/id_rsa_ansible_user
   rules:
diff --git a/group_vars/gitlabrunner.yml b/group_vars/gitlabrunner.yml
index c1fd21ec..c9e740ff 100644
--- a/group_vars/gitlabrunner.yml
+++ b/group_vars/gitlabrunner.yml
@@ -15,13 +15,6 @@
   gitlab_runner_runners:
     - name: "{{ ansible_hostname }}-docker"
       executor: docker
-      docker_image: 'alpine'
-      docker_volumes:
-        - "/var/run/docker.sock:/var/run/docker.sock"
-  ### oefenweb.ufw
-  ufw_rules:
-    - rule: allow
-      to_port: 22
-      protocol: tcp
-      comment: 'ssh'
-      from_ip: 192.168.2.0/24
+#      docker_image: 'alpine'
+#      docker_volumes:
+#        - "/var/run/docker.sock:/var/run/docker.sock"