reorganize repository to a flatter layout

mmguero · Sep 13, 2021 · 4f5c99a · 4f5c99a
1 parent f48823a
commit 4f5c99a
Show file tree

Hide file tree

Showing 109 changed files with 58 additions and 57 deletions.
diff --git a/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml b/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/calibre-web/**'
+      - 'calibre-web/**'
   workflow_dispatch:
 
 jobs:
@@ -35,8 +35,8 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./services/calibre-web
-          file: ./services/calibre-web/docker/Dockerfile.arm32v7
+          context: ./calibre-web
+          file: ./calibre-web/docker/Dockerfile.arm32v7
           platforms: linux/arm/v7
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/calibre-web:arm32v7
diff --git a/.github/workflows/calibre-web-build-push-ghcr.yml b/.github/workflows/calibre-web-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/calibre-web/**'
+      - 'calibre-web/**'
   workflow_dispatch:
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./services/calibre-web
-          file: ./services/calibre-web/docker/Dockerfile
+          context: ./calibre-web
+          file: ./calibre-web/docker/Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/calibre-web:latest
diff --git a/.github/workflows/capa-build-push-ghcr.yml b/.github/workflows/capa-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'infosec/capa/**'
+      - 'capa/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./infosec/capa
+          context: ./capa
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/capa:latest
diff --git a/.github/workflows/mattermost-build-push-ghcr.yml b/.github/workflows/mattermost-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/mattermost/**'
+      - 'mattermost/**'
   workflow_dispatch:
 
 jobs:
@@ -35,15 +35,15 @@ jobs:
         name: Build and push mattermost
         uses: docker/build-push-action@v2
         with:
-          context: ./services/mattermost
-          file: ./services/mattermost/docker/mattermost.Dockerfile
+          context: ./mattermost
+          file: ./mattermost/docker/mattermost.Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/mattermost-server:latest
       -
         name: Build and push postgres
         uses: docker/build-push-action@v2
         with:
-          context: ./services/mattermost
-          file: ./services/mattermost/docker/postgres.Dockerfile
+          context: ./mattermost
+          file: ./mattermost/docker/postgres.Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/postgres:13-alpine
diff --git a/.github/workflows/minikeyvalue-build-push-ghcr.yml b/.github/workflows/minikeyvalue-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'db/minikeyvalue/**'
+      - 'minikeyvalue/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./db/minikeyvalue
+          context: ./minikeyvalue
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/minikeyvalue:latest
diff --git a/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml b/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/nextcloud/**'
+      - 'nextcloud/**'
   workflow_dispatch:
 
 jobs:
@@ -35,8 +35,8 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./services/nextcloud
-          file: ./services/nextcloud/docker/Dockerfile.arm32v7
+          context: ./nextcloud
+          file: ./nextcloud/docker/Dockerfile.arm32v7
           platforms: linux/arm/v7
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/nextcloud:arm32v7
diff --git a/.github/workflows/nextcloud-build-push-ghcr.yml b/.github/workflows/nextcloud-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/nextcloud/**'
+      - 'nextcloud/**'
   workflow_dispatch:
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./services/nextcloud
-          file: ./services/nextcloud/docker/Dockerfile
+          context: ./nextcloud
+          file: ./nextcloud/docker/Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/nextcloud:latest
diff --git a/.github/workflows/nginx-securimage-build-push-ghcr.yml b/.github/workflows/nginx-securimage-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'net/nginx-securimage/**'
+      - 'nginx-securimage/**'
   workflow_dispatch:
 
 jobs:
@@ -35,7 +35,7 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./net/nginx-securimage
-          file: ./net/nginx-securimage/docker/nginx.Dockerfile
+          context: ./nginx-securimage
+          file: ./nginx-securimage/docker/nginx.Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/nginx-securimage:latest
diff --git a/.github/workflows/signal-build-push-ghcr.yml b/.github/workflows/signal-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'comm/signal/**'
+      - 'signal/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./comm/signal
+          context: ./signal
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/signal:latest
diff --git a/.github/workflows/stunnel-build-push-ghcr.yml b/.github/workflows/stunnel-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'net/stunnel/**'
+      - 'stunnel/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./net/stunnel
+          context: ./stunnel
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/stunnel:latest
diff --git a/.github/workflows/teams-build-push-ghcr.yml b/.github/workflows/teams-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'comm/teams/**'
+      - 'teams/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./comm/teams
+          context: ./teams
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/teams:latest
diff --git a/.github/workflows/tunneler-build-push-ghcr.yml b/.github/workflows/tunneler-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'services/tunneler/**'
+      - 'tunneler/**'
   workflow_dispatch:
 
 jobs:
@@ -35,6 +35,6 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          context: ./services/tunneler
+          context: ./tunneler
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/tunneler:latest
diff --git a/.github/workflows/xfce-build-push-ghcr.yml b/.github/workflows/xfce-build-push-ghcr.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - 'master'
     paths:
-      - 'desktop/xfce/**'
+      - 'xfce/**'
   workflow_dispatch:
 
 jobs:
@@ -35,8 +35,8 @@ jobs:
         name: Build and push base image
         uses: docker/build-push-action@v2
         with:
-          context: ./desktop/xfce
-          file: ./desktop/xfce/xfce-base.Dockerfile
+          context: ./xfce
+          file: ./xfce/xfce-base.Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/xfce-base:latest
       -
@@ -47,8 +47,8 @@ jobs:
         name: Build and push plus image
         uses: docker/build-push-action@v2
         with:
-          context: ./desktop/xfce
-          file: ./desktop/xfce/Dockerfile
+          context: ./xfce
+          file: ./xfce/Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/xfce:latest
       -
@@ -59,7 +59,7 @@ jobs:
         name: Build and push ext image
         uses: docker/build-push-action@v2
         with:
-          context: ./desktop/xfce
-          file: ./desktop/xfce/xfce-ext.Dockerfile
+          context: ./xfce
+          file: ./xfce/xfce-ext.Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository_owner }}/xfce-ext:latest
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
 [submodule "services/espejo"]
-	path = services/espejo
+	path = espejo
 	url = https://github.com/mmguero/espejo
 	branch = main
 [submodule "net/nginx-ldap"]
-	path = net/nginx-ldap
+	path = nginx-ldap
 	url = https://github.com/mmguero/nginx-ldap
 	branch = main
 [submodule "infosec/zeek"]
-	path = infosec/zeek
+	path = zeek
 	url = https://github.com/mmguero/zeek-docker
 	branch = main
diff --git a/services/bitwarden/.env → bitwarden/.env b/services/bitwarden/.env → bitwarden/.env
diff --git a/services/bitwarden/data/.gitignore → bitwarden/data/.gitignore b/services/bitwarden/data/.gitignore → bitwarden/data/.gitignore
diff --git a/services/bitwarden/docker-compose.yml → bitwarden/docker-compose.yml b/services/bitwarden/docker-compose.yml → bitwarden/docker-compose.yml
diff --git a/services/booksonic/.dockerignore → booksonic/.dockerignore b/services/booksonic/.dockerignore → booksonic/.dockerignore
diff --git a/net/unifi/config/.gitignore → booksonic/audiobooks/.gitignore b/net/unifi/config/.gitignore → booksonic/audiobooks/.gitignore
diff --git a/net/unifi/config/data/.gitignore → booksonic/config/.gitignore b/net/unifi/config/data/.gitignore → booksonic/config/.gitignore
diff --git a/services/booksonic/docker-compose.yml → booksonic/docker-compose.yml b/services/booksonic/docker-compose.yml → booksonic/docker-compose.yml
diff --git a/services/booksonic/ldap_notes.txt → booksonic/ldap_notes.txt b/services/booksonic/ldap_notes.txt → booksonic/ldap_notes.txt
diff --git a/services/booksonic/ldap_setup.sh → booksonic/ldap_setup.sh b/services/booksonic/ldap_setup.sh → booksonic/ldap_setup.sh
diff --git a/net/unifi/config/logs/.gitignore → booksonic/othermedia/.gitignore b/net/unifi/config/logs/.gitignore → booksonic/othermedia/.gitignore
diff --git a/net/unifi/config/run/.gitignore → booksonic/podcasts/.gitignore b/net/unifi/config/run/.gitignore → booksonic/podcasts/.gitignore
diff --git a/services/booksonic/proxy/nginx.conf → booksonic/proxy/nginx.conf b/services/booksonic/proxy/nginx.conf → booksonic/proxy/nginx.conf
diff --git a/services/calibre-web/.dockerignore → calibre-web/.dockerignore b/services/calibre-web/.dockerignore → calibre-web/.dockerignore
diff --git a/services/calibre-web/docker-compose.yml → calibre-web/docker-compose.yml b/services/calibre-web/docker-compose.yml → calibre-web/docker-compose.yml
diff --git a/services/calibre-web/docker/Dockerfile → calibre-web/docker/Dockerfile b/services/calibre-web/docker/Dockerfile → calibre-web/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM linuxserver/calibre-web
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/calibre-web'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/calibre-web'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/calibre-web'
 LABEL org.opencontainers.image.description='Dockerized Calibre-Web E-Book Server'

diff --git a/...ces/calibre-web/docker/Dockerfile.arm32v7 → calibre-web/docker/Dockerfile.arm32v7 b/...ces/calibre-web/docker/Dockerfile.arm32v7 → calibre-web/docker/Dockerfile.arm32v7
@@ -2,7 +2,7 @@ FROM linuxserver/calibre-web:arm32v7-latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/calibre-web'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/calibre-web'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/calibre-web'
 LABEL org.opencontainers.image.description='Dockerized Calibre-Web E-Book Server'

diff --git a/infosec/capa/.gitignore → capa/.gitignore b/infosec/capa/.gitignore → capa/.gitignore
diff --git a/infosec/capa/Dockerfile → capa/Dockerfile b/infosec/capa/Dockerfile → capa/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/infosec/capa'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/capa'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/capa'
 LABEL org.opencontainers.image.description='Dockerized capa'

diff --git a/infosec/capa/README.md → capa/README.md b/infosec/capa/README.md → capa/README.md
diff --git a/infosec/capa/capa-docker.sh → capa/capa-docker.sh b/infosec/capa/capa-docker.sh → capa/capa-docker.sh
diff --git a/services/booksonic/audiobooks/.gitignore → docker-registry/certs/.gitignore b/services/booksonic/audiobooks/.gitignore → docker-registry/certs/.gitignore
diff --git a/services/docker-registry/run.sh → docker-registry/run.sh b/services/docker-registry/run.sh → docker-registry/run.sh
diff --git a/services/espejo → espejo b/services/espejo → espejo
diff --git a/services/gogs/docker-compose.yml → gogs/docker-compose.yml b/services/gogs/docker-compose.yml → gogs/docker-compose.yml
diff --git a/services/mattermost/.dockerignore → mattermost/.dockerignore b/services/mattermost/.dockerignore → mattermost/.dockerignore
diff --git a/services/mattermost/.env.template → mattermost/.env.template b/services/mattermost/.env.template → mattermost/.env.template
diff --git a/services/mattermost/.gitignore → mattermost/.gitignore b/services/mattermost/.gitignore → mattermost/.gitignore
diff --git a/services/mattermost/config.json.template → mattermost/config.json.template b/services/mattermost/config.json.template → mattermost/config.json.template
diff --git a/services/booksonic/config/.gitignore → mattermost/data/.gitignore b/services/booksonic/config/.gitignore → mattermost/data/.gitignore
diff --git a/services/mattermost/docker-compose.yml → mattermost/docker-compose.yml b/services/mattermost/docker-compose.yml → mattermost/docker-compose.yml
diff --git a/...s/mattermost/docker/mattermost.Dockerfile → mattermost/docker/mattermost.Dockerfile b/...s/mattermost/docker/mattermost.Dockerfile → mattermost/docker/mattermost.Dockerfile
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/mattermost'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/mattermost'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/mattermost-server'
 LABEL org.opencontainers.image.description='Dockerized Mattermost Server'

diff --git a/...ces/mattermost/docker/postgres.Dockerfile → mattermost/docker/postgres.Dockerfile b/...ces/mattermost/docker/postgres.Dockerfile → mattermost/docker/postgres.Dockerfile
diff --git a/db/minikeyvalue/Dockerfile → minikeyvalue/Dockerfile b/db/minikeyvalue/Dockerfile → minikeyvalue/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/db/minikeyvalue'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/minikeyvalue'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/minikeyvalue'
 LABEL org.opencontainers.image.description='Dockerized minikeyvalue Key Value Store'

diff --git a/db/minikeyvalue/supervisord.conf → minikeyvalue/supervisord.conf b/db/minikeyvalue/supervisord.conf → minikeyvalue/supervisord.conf
diff --git a/services/nextcloud/.dockerignore → nextcloud/.dockerignore b/services/nextcloud/.dockerignore → nextcloud/.dockerignore
diff --git a/services/booksonic/othermedia/.gitignore → nextcloud/data/.gitignore b/services/booksonic/othermedia/.gitignore → nextcloud/data/.gitignore
diff --git a/services/booksonic/podcasts/.gitignore → nextcloud/db/.gitignore b/services/booksonic/podcasts/.gitignore → nextcloud/db/.gitignore
diff --git a/services/nextcloud/docker-compose.yml → nextcloud/docker-compose.yml b/services/nextcloud/docker-compose.yml → nextcloud/docker-compose.yml
diff --git a/services/nextcloud/docker/Dockerfile → nextcloud/docker/Dockerfile b/services/nextcloud/docker/Dockerfile → nextcloud/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM nextcloud:latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/nextcloud'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nextcloud'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/nextcloud'
 LABEL org.opencontainers.image.description='Dockerized Nextcloud'

diff --git a/services/nextcloud/docker/Dockerfile.arm32v7 → nextcloud/docker/Dockerfile.arm32v7 b/services/nextcloud/docker/Dockerfile.arm32v7 → nextcloud/docker/Dockerfile.arm32v7
@@ -2,7 +2,7 @@ FROM arm32v7/nextcloud:latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/nextcloud'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nextcloud'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/nextcloud'
 LABEL org.opencontainers.image.description='Dockerized Nextcloud (arm32v7)'

diff --git a/net/nginx-ldap → nginx-ldap b/net/nginx-ldap → nginx-ldap
diff --git a/...s/nginx-proxy/config/proxy_overrides.conf → nginx-proxy/config/proxy_overrides.conf b/...s/nginx-proxy/config/proxy_overrides.conf → nginx-proxy/config/proxy_overrides.conf
diff --git a/services/nginx-proxy/docker-compose.yml → nginx-proxy/docker-compose.yml b/services/nginx-proxy/docker-compose.yml → nginx-proxy/docker-compose.yml
diff --git a/net/nginx-securimage/docker-compose.yml → nginx-securimage/docker-compose.yml b/net/nginx-securimage/docker-compose.yml → nginx-securimage/docker-compose.yml
diff --git a/net/nginx-securimage/docker/nginx.Dockerfile → nginx-securimage/docker/nginx.Dockerfile b/net/nginx-securimage/docker/nginx.Dockerfile → nginx-securimage/docker/nginx.Dockerfile
@@ -2,7 +2,7 @@ FROM trafex/alpine-nginx-php7:latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/net/nginx-securimage'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nginx-securimage'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/nginx-securimage'
 LABEL org.opencontainers.image.description='Dockerized NGINX with Securimage PHP Captcha'

diff --git a/net/nginx-securimage/nginx/server.conf → nginx-securimage/nginx/server.conf b/net/nginx-securimage/nginx/server.conf → nginx-securimage/nginx/server.conf
diff --git a/...ginx-securimage/php/php-fpm-settings.conf → nginx-securimage/php/php-fpm-settings.conf b/...ginx-securimage/php/php-fpm-settings.conf → nginx-securimage/php/php-fpm-settings.conf
diff --git a/net/nginx-securimage/php/php.ini → nginx-securimage/php/php.ini b/net/nginx-securimage/php/php.ini → nginx-securimage/php/php.ini
diff --git a/net/nginx-securimage/webcontent/index.php → nginx-securimage/webcontent/index.php b/net/nginx-securimage/webcontent/index.php → nginx-securimage/webcontent/index.php
diff --git a/services/openldap/docker-compose.yml → openldap/docker-compose.yml b/services/openldap/docker-compose.yml → openldap/docker-compose.yml
diff --git a/services/pihole/docker-compose.yml → pihole/docker-compose.yml b/services/pihole/docker-compose.yml → pihole/docker-compose.yml
diff --git a/services/pihole/etc-dnsmasq.d/.gitignore → pihole/etc-dnsmasq.d/.gitignore b/services/pihole/etc-dnsmasq.d/.gitignore → pihole/etc-dnsmasq.d/.gitignore
diff --git a/...s/pihole/etc-dnsmasq.d/03-custom-dns.conf → pihole/etc-dnsmasq.d/03-custom-dns.conf b/...s/pihole/etc-dnsmasq.d/03-custom-dns.conf → pihole/etc-dnsmasq.d/03-custom-dns.conf
diff --git a/services/pihole/etc-pihole/.gitignore → pihole/etc-pihole/.gitignore b/services/pihole/etc-pihole/.gitignore → pihole/etc-pihole/.gitignore
diff --git a/services/pihole/etc-pihole/custom.list → pihole/etc-pihole/custom.list b/services/pihole/etc-pihole/custom.list → pihole/etc-pihole/custom.list
diff --git a/services/pihole/var-log/.gitignore → pihole/var-log/.gitignore b/services/pihole/var-log/.gitignore → pihole/var-log/.gitignore
diff --git a/services/screego/docker-compose.yml → screego/docker-compose.yml b/services/screego/docker-compose.yml → screego/docker-compose.yml
diff --git a/comm/signal/Dockerfile → signal/Dockerfile b/comm/signal/Dockerfile → signal/Dockerfile
@@ -11,7 +11,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/comm/signal'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/signal'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/signal'
 LABEL org.opencontainers.image.description='Dockerized Signal (X11)'

diff --git a/services/docker-registry/certs/.gitignore → smtp4dev/certs/.gitignore b/services/docker-registry/certs/.gitignore → smtp4dev/certs/.gitignore
diff --git a/services/smtp4dev/docker-compose.yml → smtp4dev/docker-compose.yml b/services/smtp4dev/docker-compose.yml → smtp4dev/docker-compose.yml
diff --git a/db/splunk/docker-compose.yml → splunk/docker-compose.yml b/db/splunk/docker-compose.yml → splunk/docker-compose.yml
diff --git a/services/step-ca/.dockerignore → step-ca/.dockerignore b/services/step-ca/.dockerignore → step-ca/.dockerignore
diff --git a/services/step-ca/.gitignore → step-ca/.gitignore b/services/step-ca/.gitignore → step-ca/.gitignore
diff --git a/services/step-ca/README.md → step-ca/README.md b/services/step-ca/README.md → step-ca/README.md
diff --git a/services/step-ca/docker-compose.yml → step-ca/docker-compose.yml b/services/step-ca/docker-compose.yml → step-ca/docker-compose.yml
diff --git a/services/mattermost/data/.gitignore → step-ca/step/.gitignore b/services/mattermost/data/.gitignore → step-ca/step/.gitignore
diff --git a/services/nextcloud/data/.gitignore → step-ca/step/certs/.gitignore b/services/nextcloud/data/.gitignore → step-ca/step/certs/.gitignore
diff --git a/services/nextcloud/db/.gitignore → step-ca/step/config/.gitignore b/services/nextcloud/db/.gitignore → step-ca/step/config/.gitignore
diff --git a/services/smtp4dev/certs/.gitignore → step-ca/step/db/.gitignore b/services/smtp4dev/certs/.gitignore → step-ca/step/db/.gitignore
diff --git a/services/step-ca/step/.gitignore → step-ca/step/secrets/.gitignore b/services/step-ca/step/.gitignore → step-ca/step/secrets/.gitignore
diff --git a/services/step-ca/step/certs/.gitignore → step-ca/step/templates/.gitignore b/services/step-ca/step/certs/.gitignore → step-ca/step/templates/.gitignore
diff --git a/net/stunnel/Dockerfile → stunnel/Dockerfile b/net/stunnel/Dockerfile → stunnel/Dockerfile
@@ -2,7 +2,7 @@ FROM vimagick/stunnel:latest
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/net/stunnel'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/stunnel'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/stunnel'
 LABEL org.opencontainers.image.description='Dockerized stunnel'

diff --git a/comm/teams/Dockerfile → teams/Dockerfile b/comm/teams/Dockerfile → teams/Dockerfile
@@ -11,7 +11,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/comm/teams'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/teams'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/teams'
 LABEL org.opencontainers.image.description='Dockerized Microsoft Teams (X11)'

diff --git a/services/step-ca/step/config/.gitignore → traefix-proxy/certs/.gitignore b/services/step-ca/step/config/.gitignore → traefix-proxy/certs/.gitignore
diff --git a/services/traefix-proxy/docker-compose.yml → traefix-proxy/docker-compose.yml b/services/traefix-proxy/docker-compose.yml → traefix-proxy/docker-compose.yml
diff --git a/services/step-ca/step/db/.gitignore → traefix-proxy/letsencrypt/.gitignore b/services/step-ca/step/db/.gitignore → traefix-proxy/letsencrypt/.gitignore
diff --git a/services/tunneler/Dockerfile → tunneler/Dockerfile b/services/tunneler/Dockerfile → tunneler/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:buster-slim
 
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.authors='[email protected]'
-LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/tunneler'
+LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/tunneler'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.title='mmguero/tunneler'
 LABEL org.opencontainers.image.description='Dockerized Tunneling Services'

diff --git a/services/tunneler/croc_relay_entrypoint.sh → tunneler/croc_relay_entrypoint.sh b/services/tunneler/croc_relay_entrypoint.sh → tunneler/croc_relay_entrypoint.sh
diff --git a/services/tunneler/docker-compose.yml → tunneler/docker-compose.yml b/services/tunneler/docker-compose.yml → tunneler/docker-compose.yml
diff --git a/services/tunneler/supervisord.conf → tunneler/supervisord.conf b/services/tunneler/supervisord.conf → tunneler/supervisord.conf
diff --git a/net/unifi/Dockerfile → unifi/Dockerfile b/net/unifi/Dockerfile → unifi/Dockerfile
diff --git a/services/step-ca/step/secrets/.gitignore → unifi/config/.gitignore b/services/step-ca/step/secrets/.gitignore → unifi/config/.gitignore
diff --git a/services/step-ca/step/templates/.gitignore → unifi/config/data/.gitignore b/services/step-ca/step/templates/.gitignore → unifi/config/data/.gitignore
diff --git a/services/traefix-proxy/certs/.gitignore → unifi/config/logs/.gitignore b/services/traefix-proxy/certs/.gitignore → unifi/config/logs/.gitignore
diff --git a/...ices/traefix-proxy/letsencrypt/.gitignore → unifi/config/run/.gitignore b/...ices/traefix-proxy/letsencrypt/.gitignore → unifi/config/run/.gitignore
diff --git a/net/unifi/docker-compose.yml → unifi/docker-compose.yml b/net/unifi/docker-compose.yml → unifi/docker-compose.yml
diff --git a/net/unifi/entrypoint.sh → unifi/entrypoint.sh b/net/unifi/entrypoint.sh → unifi/entrypoint.sh
diff --git a/services/vault/.dockerignore → vault/.dockerignore b/services/vault/.dockerignore → vault/.dockerignore