Restructure repositories

.gitlab-ci.yml

@@ -9,9 +9,9 @@ before_script:
 build-master:
   stage: build
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE/ansible-base ./docker
-    - docker push $CI_REGISTRY_IMAGE/ansible-base
-    - docker build --pull -t $CI_REGISTRY_IMAGE/ansible-general .
-    - docker push $CI_REGISTRY_IMAGE/ansible-general
+    - docker build --pull -t $CI_REGISTRY_IMAGE/base ./docker
+    - docker push $CI_REGISTRY_IMAGE/base
+    - docker build --pull -t $CI_REGISTRY_IMAGE/general .
+    - docker push $CI_REGISTRY_IMAGE/general
   only:
     - master

.gitmodules

 [submodule "wiki"]
 	path = wiki
-	url = ../../ansible-playbooks/general.wiki.git
+	url = ../../ansible/playbooks/general.wiki.git
 [submodule "plugins/jiffybox"]
 	path = plugins/jiffybox
-	url = ../../ansible-plugins/jiffybox.git
+	url = ../../ansible/plugins/jiffybox.git
 [submodule "plugins/serverdensity"]
 	path = plugins/serverdensity
-	url = ../../ansible-plugins/serverdensity.git
+	url = ../../ansible/plugins/serverdensity.git
 [submodule "plugins/uptime"]
 	path = plugins/uptime
-	url = ../../ansible-plugins/uptime.git
+	url = ../../ansible/plugins/uptime.git
 [submodule "plugins/drush"]
 	path = plugins/drush
-	url = ../../ansible-plugins/drush.git
+	url = ../../ansible/plugins/drush.git
 [submodule "plugins/gitlab"]
 	path = plugins/gitlab
-	url = ../../ansible-plugins/gitlab.git
+	url = ../../ansible/plugins/gitlab.git
 [submodule "plugins/fluentd"]
 	path = plugins/fluentd
-	url = ../../ansible-plugins/fluentd.git
+	url = ../../ansible/plugins/fluentd.git
 [submodule "roles/commonauth"]
 	path = roles/commonauth
-	url = ../../ansible-roles/commonauth.git
+	url = ../../ansible/roles/commonauth.git
 [submodule "roles/commonkeys"]
 	path = roles/commonkeys
-	url = ../../ansible-roles/commonkeys.git
+	url = ../../ansible/roles/commonkeys.git
 [submodule "roles/common"]
 	path = roles/common
-	url = ../../ansible-roles/common.git
+	url = ../../ansible/roles/common.git
 [submodule "roles/mysql"]
 	path = roles/mysql
-	url = ../../ansible-roles/mysql.git
+	url = ../../ansible/roles/mysql.git
 [submodule "roles/drupal"]
 	path = roles/drupal
-	url = ../../ansible-roles/drupal.git
+	url = ../../ansible/roles/drupal.git
 [submodule "roles/drupalconsole"]
 	path = roles/drupalconsole
-	url = ../../ansible-roles/drupalconsole.git
+	url = ../../ansible/roles/drupalconsole.git
 [submodule "roles/drush"]
 	path = roles/drush
-	url = ../../ansible-roles/drush.git
+	url = ../../ansible/roles/drush.git
 [submodule "roles/serverdensity"]
 	path = roles/serverdensity
-	url = ../../ansible-roles/serverdensity.git
+	url = ../../ansible/roles/serverdensity.git
 [submodule "roles/apache"]
 	path = roles/apache
-	url = ../../ansible-roles/apache.git
+	url = ../../ansible/roles/apache.git
 [submodule "roles/gitlab"]
 	path = roles/gitlab
-	url = ../../ansible-roles/gitlab.git
+	url = ../../ansible/roles/gitlab.git
 [submodule "roles/nodejs"]
 	path = roles/nodejs
-	url = ../../ansible-roles/nodejs.git
+	url = ../../ansible/roles/nodejs.git
 [submodule "roles/youtrack"]
 	path = roles/youtrack
-	url = ../../ansible-roles/youtrack.git
+	url = ../../ansible/roles/youtrack.git
 [submodule "roles/haproxy"]
 	path = roles/haproxy
-	url = ../../ansible-roles/haproxy.git
+	url = ../../ansible/roles/haproxy.git
 [submodule "roles/sftp"]
 	path = roles/sftp
-	url = ../../ansible-roles/sftp.git
+	url = ../../ansible/roles/sftp.git
 [submodule "roles/php"]
 	path = roles/php
-	url = ../../ansible-roles/php.git
+	url = ../../ansible/roles/php.git
 [submodule "roles/mysql-client"]
 	path = roles/mysql-client
-	url = ../../ansible-roles/mysql-client.git
+	url = ../../ansible/roles/mysql-client.git
 [submodule "roles/oracle"]
 	path = roles/oracle
-	url = ../../ansible-roles/oracle.git
+	url = ../../ansible/roles/oracle.git
 [submodule "roles/svnserver"]
 	path = roles/svnserver
-	url = ../../ansible-roles/svnserver.git
+	url = ../../ansible/roles/svnserver.git
 [submodule "roles/redis"]
 	path = roles/redis
-	url = ../../ansible-roles/redis.git
+	url = ../../ansible/roles/redis.git
 [submodule "roles/matomo"]
 	path = roles/matomo
-	url = ../../ansible-roles/matomo.git
+	url = ../../ansible/roles/matomo.git
 [submodule "roles/aptproxy"]
 	path = roles/aptproxy
-	url = ../../ansible-roles/aptproxy.git
+	url = ../../ansible/roles/aptproxy.git
 [submodule "roles/compass"]
 	path = roles/compass
-	url = ../../ansible-roles/compass.git
+	url = ../../ansible/roles/compass.git
 [submodule "roles/openphoto"]
 	path = roles/openphoto
-	url = ../../ansible-roles/openphoto.git
+	url = ../../ansible/roles/openphoto.git
 [submodule "roles/owncloud"]
 	path = roles/owncloud
-	url = ../../ansible-roles/owncloud.git
+	url = ../../ansible/roles/owncloud.git
 [submodule "roles/user-management"]
 	path = roles/user-management
-	url = ../../ansible-roles/user-management.git
+	url = ../../ansible/roles/user-management.git
 [submodule "roles/composer"]
 	path = roles/composer
-	url = ../../ansible-roles/composer.git
+	url = ../../ansible/roles/composer.git
 [submodule "roles/cloud"]
 	path = roles/cloud
-	url = ../../ansible-roles/cloud.git
+	url = ../../ansible/roles/cloud.git
 [submodule "roles/elasticsearch"]
 	path = roles/elasticsearch
-	url = ../../ansible-roles/elasticsearch.git
+	url = ../../ansible/roles/elasticsearch.git
 [submodule "roles/fluentd"]
 	path = roles/fluentd
-	url = ../../ansible-roles/fluentd.git
+	url = ../../ansible/roles/fluentd.git
 [submodule "roles/fluentd-client"]
 	path = roles/fluentd-client
-	url = ../../ansible-roles/fluentd-client.git
+	url = ../../ansible/roles/fluentd-client.git
 [submodule "roles/jailkit"]
 	path = roles/jailkit
-	url = ../../ansible-roles/jailkit.git
+	url = ../../ansible/roles/jailkit.git
 [submodule "roles/java"]
 	path = roles/java
-	url = ../../ansible-roles/java.git
+	url = ../../ansible/roles/java.git
 [submodule "roles/kibana"]
 	path = roles/kibana
-	url = ../../ansible-roles/kibana.git
+	url = ../../ansible/roles/kibana.git
 [submodule "roles/letsencrypt"]
 	path = roles/letsencrypt
-	url = ../../ansible-roles/letsencrypt.git
+	url = ../../ansible/roles/letsencrypt.git
 [submodule "roles/memcache"]
 	path = roles/memcache
-	url = ../../ansible-roles/memcache.git
+	url = ../../ansible/roles/memcache.git
 [submodule "roles/mongodb"]
 	path = roles/mongodb
-	url = ../../ansible-roles/mongodb.git
+	url = ../../ansible/roles/mongodb.git
 [submodule "roles/s3"]
 	path = roles/s3
-	url = ../../ansible-roles/s3.git
+	url = ../../ansible/roles/s3.git
 [submodule "roles/spideroak"]
 	path = roles/spideroak
-	url = ../../ansible-roles/spideroak.git
+	url = ../../ansible/roles/spideroak.git
 [submodule "roles/uptime"]
 	path = roles/uptime
-	url = ../../ansible-roles/uptime.git
+	url = ../../ansible/roles/uptime.git
 [submodule "roles/varnish"]
 	path = roles/varnish
-	url = ../../ansible-roles/varnish.git
+	url = ../../ansible/roles/varnish.git
 [submodule "roles/netdata"]
 	path = roles/netdata
-	url = ../../ansible-roles/netdata.git
+	url = ../../ansible/roles/netdata.git
 [submodule "roles/drupal-cli"]
 	path = roles/drupal-cli
-	url = ../../ansible-roles/drupal-cli.git
+	url = ../../ansible/roles/drupal-cli.git
 [submodule "roles/gcloud"]
 	path = roles/gcloud
-	url = ../../ansible-roles/gcloud.git
+	url = ../../ansible/roles/gcloud.git
 [submodule "roles/commonconnect"]
 	path = roles/commonconnect
-	url = ../../ansible-roles/commonconnect.git
+	url = ../../ansible/roles/commonconnect.git
 [submodule "roles/nextcloud"]
 	path = roles/nextcloud
-	url = ../../ansible-roles/nextcloud.git
+	url = ../../ansible/roles/nextcloud.git
 [submodule "roles/docker"]
 	path = roles/docker
-	url = ../../ansible-roles/docker.git
+	url = ../../ansible/roles/docker.git
 [submodule "roles/matterbridge"]
 	path = roles/matterbridge
-	url = ../../ansible-roles/matterbridge.git
+	url = ../../ansible/roles/matterbridge.git
 [submodule "roles/elastalert"]
 	path = roles/elastalert
-	url = ../../ansible-roles/elastalert.git
+	url = ../../ansible/roles/elastalert.git
 [submodule "roles/fail2ban"]
 	path = roles/fail2ban
-	url = ../../ansible-roles/fail2ban.git
+	url = ../../ansible/roles/fail2ban.git
 [submodule "roles/wkhtmltopdf"]
 	path = roles/wkhtmltopdf
-	url = ../../ansible-roles/wkhtmltopdf.git
+	url = ../../ansible/roles/wkhtmltopdf.git
 [submodule "roles/golang"]
 	path = roles/golang
-	url = ../../ansible-roles/golang.git
+	url = ../../ansible/roles/golang.git
 [submodule "roles/mailhog"]
 	path = roles/mailhog
-	url = ../../ansible-roles/mailhog.git
+	url = ../../ansible/roles/mailhog.git
 [submodule "roles/tomcat"]
 	path = roles/tomcat
-	url = ../../ansible-roles/tomcat.git
+	url = ../../ansible/roles/tomcat.git
 [submodule "roles/zabbix_agent"]
 	path = roles/zabbix_agent
-	url = ../../ansible-roles/zabbix_agent.git
+	url = ../../ansible/roles/zabbix_agent.git
 [submodule "roles/discourse"]
 	path = roles/discourse
-	url = ../../ansible-roles/discourse.git
+	url = ../../ansible/roles/discourse.git
 [submodule "roles/vpn"]
 	path = roles/vpn
-	url = ../../ansible-roles/vpn.git
+	url = ../../ansible/roles/vpn.git
 [submodule "roles/alerta"]
 	path = roles/alerta
-	url = ../../ansible-roles/alerta
+	url = ../../ansible/roles/alerta
 [submodule "roles/nginx"]
 	path = roles/nginx
-	url = ../../ansible-roles/nginx
+	url = ../../ansible/roles/nginx
 [submodule "roles/gitlab-runner"]
 	path = roles/gitlab-runner
-	url = ../../ansible-roles/gitlab-runner
+	url = ../../ansible/roles/gitlab-runner
 [submodule "roles/virtualbox"]
 	path = roles/virtualbox
-	url = ../../ansible-roles/virtualbox
+	url = ../../ansible/roles/virtualbox
 [submodule "roles/heartbeat"]
 	path = roles/heartbeat
-	url = ../../ansible-roles/heartbeat
+	url = ../../ansible/roles/heartbeat
 [submodule "roles/gitlab-client"]
 	path = roles/gitlab-client
-	url = ../../ansible-roles/gitlab-client
+	url = ../../ansible/roles/gitlab-client
 [submodule "roles/zammad"]
 	path = roles/zammad
-	url = ../../ansible-roles/zammad
+	url = ../../ansible/roles/zammad
 [submodule "roles/satis"]
 	path = roles/satis
-	url = ../../ansible-roles/satis
+	url = ../../ansible/roles/satis
 [submodule "roles/home-assistant"]
 	path = roles/home-assistant
-	url = ../../ansible-roles/home-assistant
+	url = ../../ansible/roles/home-assistant
 [submodule "roles/suitecrm"]
 	path = roles/suitecrm
-	url = ../../ansible-roles/suitecrm
+	url = ../../ansible/roles/suitecrm
 [submodule "roles/plantuml"]
 	path = roles/plantuml
-	url = ../../ansible-roles/plantuml
+	url = ../../ansible/roles/plantuml
 [submodule "roles/keycloak"]
 	path = roles/keycloak
-	url = ../../ansible-roles/keycloak
+	url = ../../ansible/roles/keycloak
 [submodule "roles/almond"]
 	path = roles/almond
-	url = ../../ansible-roles/almond
+	url = ../../ansible/roles/almond
 [submodule "roles/auditbeat"]
 	path = roles/auditbeat
-	url = ../../ansible-roles/auditbeat
+	url = ../../ansible/roles/auditbeat
 [submodule "roles/packetbeat"]
 	path = roles/packetbeat
-	url = ../../ansible-roles/packetbeat
+	url = ../../ansible/roles/packetbeat
 [submodule "roles/artifactory"]
 	path = roles/artifactory
-	url = ../../ansible-roles/artifactory
+	url = ../../ansible/roles/artifactory
 [submodule "roles/borgbackup"]
 	path = roles/borgbackup
-	url = ../../ansible-roles/borgbackup
+	url = ../../ansible/roles/borgbackup

Dockerfile

-FROM registry.lakedrops.com/ansible-playbooks/general/ansible-base:latest
+FROM registry.lakedrops.com/ansible/playbooks/general/base:latest
 
 LABEL description="General Ansible image to be built upon by an inventory from https://gitlab.lakedrops.com/ansible-inventories"
 

docker/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:16.04
 LABEL com.example.vendor="PARAGON Executive Service GmbH" \
       maintainer="juergen@paragon-es.de" \
       version="1.0.0" \
-      description="Base Ansible image to be built upon by https://gitlab.lakedrops.com/ansible-playbooks/general"
+      description="Base Ansible image to be built upon by https://gitlab.lakedrops.com/ansible/playbooks/general"
 
 RUN echo "===> Adding Ansible's prerequisites..." && \
     apt-get update -y && \