diff --git a/media/photoprism/config-admin-blanked.env b/media/photoprism/config-admin.env.example similarity index 100% rename from media/photoprism/config-admin-blanked.env rename to media/photoprism/config-admin.env.example diff --git a/media/photoprism/config-public-blanked.env b/media/photoprism/config-public.env.example similarity index 100% rename from media/photoprism/config-public-blanked.env rename to media/photoprism/config-public.env.example diff --git a/media/transmission/docker-compose.yml.BLANKED b/media/transmission/docker-compose.yml.example similarity index 100% rename from media/transmission/docker-compose.yml.BLANKED rename to media/transmission/docker-compose.yml.example diff --git a/misc/covid19/docker-compose.yml.blanked b/misc/covid19/docker-compose.yml.example similarity index 100% rename from misc/covid19/docker-compose.yml.blanked rename to misc/covid19/docker-compose.yml.example diff --git a/misc/homepage/docker-compose.yml.blanked b/misc/homepage/docker-compose.yml.example similarity index 100% rename from misc/homepage/docker-compose.yml.blanked rename to misc/homepage/docker-compose.yml.example diff --git a/software-development/code-server/docker-compose.yml.blanked b/software-development/code-server/docker-compose.yml.example similarity index 100% rename from software-development/code-server/docker-compose.yml.blanked rename to software-development/code-server/docker-compose.yml.example diff --git a/software-development/gitea/database.env.BLANKED b/software-development/gitea/database.env.example similarity index 100% rename from software-development/gitea/database.env.BLANKED rename to software-development/gitea/database.env.example diff --git a/software-development/gitea/gitea.env.BLANKED b/software-development/gitea/gitea.env.example similarity index 100% rename from software-development/gitea/gitea.env.BLANKED rename to software-development/gitea/gitea.env.example diff --git a/software-development/grafana/docker-compose.yml.blanked b/software-development/grafana/docker-compose.yml.example similarity index 100% rename from software-development/grafana/docker-compose.yml.blanked rename to software-development/grafana/docker-compose.yml.example diff --git a/software-development/jenkins/.gitignore b/software-development/jenkins/.gitignore deleted file mode 100644 index 9b05ea1..0000000 --- a/software-development/jenkins/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -docker-compose.yml - diff --git a/software-development/jenkins/docker-compose.yml.blanked b/software-development/jenkins/docker-compose.yml similarity index 81% rename from software-development/jenkins/docker-compose.yml.blanked rename to software-development/jenkins/docker-compose.yml index 798fcbc..86e2577 100644 --- a/software-development/jenkins/docker-compose.yml.blanked +++ b/software-development/jenkins/docker-compose.yml @@ -1,7 +1,7 @@ -version: '3.7' +volumesersion: '3.7' networks: - TRAEFIK_NETWORK: + traefik: external: true services: @@ -10,7 +10,7 @@ services: container_name: jenkins restart: unless-stopped networks: - - [TRAEFIK_NETWORK] + - traefik privileged: true user: root volumes: @@ -18,7 +18,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /usr/local/bin/docker:/usr/local/bin/docker labels: - - traefik.http.routers.jenkins.rule=Host(`[SUBDOMAIN_URL]`) + - traefik.http.routers.jenkins.rule=Host(`jenkins.whitney.rip`) - traefik.http.routers.jenkins.tls=true - traefik.http.routers.jenkins.tls.certresolver=lets-encrypt - traefik.http.services.jenkins.loadbalancer.server.port=8080 diff --git a/software-development/portainer/.gitignore b/software-development/portainer/.gitignore deleted file mode 100644 index 9b05ea1..0000000 --- a/software-development/portainer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -docker-compose.yml - diff --git a/software-development/portainer/docker-compose.yml.blanked b/software-development/portainer/docker-compose.yml similarity index 88% rename from software-development/portainer/docker-compose.yml.blanked rename to software-development/portainer/docker-compose.yml index c2651da..3ba9247 100644 --- a/software-development/portainer/docker-compose.yml.blanked +++ b/software-development/portainer/docker-compose.yml @@ -16,7 +16,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - portainer_data:/data labels: - - traefik.http.routers.portainer.rule=Host(`[[SITE_URL]]`) + - traefik.http.routers.portainer.rule=Host(`admin.whitney.rip`) - traefik.http.routers.portainer.tls=true - traefik.http.routers.portainer.tls.certresolver=lets-encrypt - traefik.http.services.portainer.loadbalancer.server.port=9000 diff --git a/software-development/traefik/docker-compose.yml.blanked b/software-development/traefik/docker-compose.yml.example similarity index 100% rename from software-development/traefik/docker-compose.yml.blanked rename to software-development/traefik/docker-compose.yml.example diff --git a/software-development/traefik/traefik-dynamic.toml.blanked b/software-development/traefik/traefik-dynamic.toml.example similarity index 100% rename from software-development/traefik/traefik-dynamic.toml.blanked rename to software-development/traefik/traefik-dynamic.toml.example diff --git a/software-development/traefik/traefik.toml.BLANKED b/software-development/traefik/traefik.toml.example similarity index 100% rename from software-development/traefik/traefik.toml.BLANKED rename to software-development/traefik/traefik.toml.example