From 9d49a1eec826fe8d1f3ca9fe5876787f8de4398a Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sun, 18 Oct 2020 15:51:54 +0200 Subject: [PATCH] services: migrate letsencrypt to swag --- .gitignore | 12 ++++++------ docker-compose.yml | 10 +++++----- .../nginx/proxy-confs/authelia.subdomain.conf | 0 .../nginx/proxy-confs/bazarr.subdomain.conf | 0 .../nginx/proxy-confs/calibre-cc.subdomain.conf | 0 .../nginx/proxy-confs/calibre-web.subdomain.conf | 0 .../nginx/proxy-confs/calibre.subdomain.conf | 0 .../nginx/proxy-confs/chat.subdomain.conf | 0 .../nginx/proxy-confs/drone.subdomain.conf | 0 .../nginx/proxy-confs/fava.subdomain.conf | 0 .../nginx/proxy-confs/freshrss.subdomain.conf | 0 .../nginx/proxy-confs/gitea.subdomain.conf | 0 .../nginx/proxy-confs/jackett.subdomain.conf | 0 .../nginx/proxy-confs/jellyfin.subdomain.conf | 0 .../nginx/proxy-confs/komga.subdomain.conf | 0 .../nginx/proxy-confs/lab.subdomain.conf | 0 .../nginx/proxy-confs/mail.subdomain.conf | 0 .../nginx/proxy-confs/matrix.subdomain.conf | 0 .../nginx/proxy-confs/nzbhydra.subdomain.conf | 0 .../nginx/proxy-confs/photoprism.subdomain.conf | 0 .../nginx/proxy-confs/pyload.subdomain.conf | 0 .../nginx/proxy-confs/radarr.subdomain.conf | 0 .../nginx/proxy-confs/rss-bridge.subdomain.conf | 0 .../nginx/proxy-confs/sabnzbd.subdomain.conf | 0 .../nginx/proxy-confs/sonarr.subdomain.conf | 0 .../nginx/proxy-confs/syncthing.subdomain.conf | 0 .../nginx/proxy-confs/transmission.subdomain.conf | 0 .../nginx/proxy-confs/wallabag.subdomain.conf | 0 .../nginx/proxy-confs/wg.subdomain.conf | 0 {letsencrypt => swag}/nginx/site-confs/default | 0 letsencrypt/letsencrypt.env => swag/swag.env | 0 31 files changed, 11 insertions(+), 11 deletions(-) rename {letsencrypt => swag}/nginx/proxy-confs/authelia.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/bazarr.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/calibre-cc.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/calibre-web.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/calibre.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/chat.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/drone.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/fava.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/freshrss.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/gitea.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/jackett.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/jellyfin.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/komga.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/lab.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/mail.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/matrix.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/nzbhydra.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/photoprism.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/pyload.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/radarr.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/rss-bridge.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/sabnzbd.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/sonarr.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/syncthing.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/transmission.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/wallabag.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/proxy-confs/wg.subdomain.conf (100%) rename {letsencrypt => swag}/nginx/site-confs/default (100%) rename letsencrypt/letsencrypt.env => swag/swag.env (100%) diff --git a/.gitignore b/.gitignore index 4e61231..a982b04 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,11 @@ /*/*.env.secret # Just to document that they should definitely never be added # This is not necessary with the wildcard used in the first line, but it is clearer -/letsencrypt/* -!/letsencrypt/nginx/ +/swag/* +!/swag/nginx/ -/letsencrypt/nginx/* -!/letsencrypt/nginx/proxy-confs/ +/swag/nginx/* +!/swag/nginx/proxy-confs/ -/letsencrypt/nginx/proxy-confs/*.sample -/letsencrypt/nginx/proxy-confs/README.md +/swag/nginx/proxy-confs/*.sample +/swag/nginx/proxy-confs/README.md diff --git a/docker-compose.yml b/docker-compose.yml index 1d38494..e8b2bcf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,16 @@ version: "3" services: - letsencrypt: - image: linuxserver/letsencrypt - container_name: letsencrypt + swag: + image: linuxserver/swag + container_name: swag restart: unless-stopped cap_add: - NET_ADMIN env_file: - - ./letsencrypt/letsencrypt.env + - ./swag/swag.env volumes: - - ./letsencrypt:/config + - ./swag:/config ports: - 80:80 - 443:443 diff --git a/letsencrypt/nginx/proxy-confs/authelia.subdomain.conf b/swag/nginx/proxy-confs/authelia.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/authelia.subdomain.conf rename to swag/nginx/proxy-confs/authelia.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/bazarr.subdomain.conf b/swag/nginx/proxy-confs/bazarr.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/bazarr.subdomain.conf rename to swag/nginx/proxy-confs/bazarr.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/calibre-cc.subdomain.conf b/swag/nginx/proxy-confs/calibre-cc.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/calibre-cc.subdomain.conf rename to swag/nginx/proxy-confs/calibre-cc.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/calibre-web.subdomain.conf b/swag/nginx/proxy-confs/calibre-web.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/calibre-web.subdomain.conf rename to swag/nginx/proxy-confs/calibre-web.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/calibre.subdomain.conf b/swag/nginx/proxy-confs/calibre.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/calibre.subdomain.conf rename to swag/nginx/proxy-confs/calibre.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/chat.subdomain.conf b/swag/nginx/proxy-confs/chat.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/chat.subdomain.conf rename to swag/nginx/proxy-confs/chat.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/drone.subdomain.conf b/swag/nginx/proxy-confs/drone.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/drone.subdomain.conf rename to swag/nginx/proxy-confs/drone.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/fava.subdomain.conf b/swag/nginx/proxy-confs/fava.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/fava.subdomain.conf rename to swag/nginx/proxy-confs/fava.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/freshrss.subdomain.conf b/swag/nginx/proxy-confs/freshrss.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/freshrss.subdomain.conf rename to swag/nginx/proxy-confs/freshrss.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/gitea.subdomain.conf b/swag/nginx/proxy-confs/gitea.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/gitea.subdomain.conf rename to swag/nginx/proxy-confs/gitea.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/jackett.subdomain.conf b/swag/nginx/proxy-confs/jackett.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/jackett.subdomain.conf rename to swag/nginx/proxy-confs/jackett.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/jellyfin.subdomain.conf b/swag/nginx/proxy-confs/jellyfin.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/jellyfin.subdomain.conf rename to swag/nginx/proxy-confs/jellyfin.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/komga.subdomain.conf b/swag/nginx/proxy-confs/komga.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/komga.subdomain.conf rename to swag/nginx/proxy-confs/komga.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/lab.subdomain.conf b/swag/nginx/proxy-confs/lab.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/lab.subdomain.conf rename to swag/nginx/proxy-confs/lab.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/mail.subdomain.conf b/swag/nginx/proxy-confs/mail.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/mail.subdomain.conf rename to swag/nginx/proxy-confs/mail.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/matrix.subdomain.conf b/swag/nginx/proxy-confs/matrix.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/matrix.subdomain.conf rename to swag/nginx/proxy-confs/matrix.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/nzbhydra.subdomain.conf b/swag/nginx/proxy-confs/nzbhydra.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/nzbhydra.subdomain.conf rename to swag/nginx/proxy-confs/nzbhydra.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/photoprism.subdomain.conf b/swag/nginx/proxy-confs/photoprism.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/photoprism.subdomain.conf rename to swag/nginx/proxy-confs/photoprism.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/pyload.subdomain.conf b/swag/nginx/proxy-confs/pyload.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/pyload.subdomain.conf rename to swag/nginx/proxy-confs/pyload.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/radarr.subdomain.conf b/swag/nginx/proxy-confs/radarr.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/radarr.subdomain.conf rename to swag/nginx/proxy-confs/radarr.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/rss-bridge.subdomain.conf b/swag/nginx/proxy-confs/rss-bridge.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/rss-bridge.subdomain.conf rename to swag/nginx/proxy-confs/rss-bridge.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/sabnzbd.subdomain.conf b/swag/nginx/proxy-confs/sabnzbd.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/sabnzbd.subdomain.conf rename to swag/nginx/proxy-confs/sabnzbd.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/sonarr.subdomain.conf b/swag/nginx/proxy-confs/sonarr.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/sonarr.subdomain.conf rename to swag/nginx/proxy-confs/sonarr.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/syncthing.subdomain.conf b/swag/nginx/proxy-confs/syncthing.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/syncthing.subdomain.conf rename to swag/nginx/proxy-confs/syncthing.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/transmission.subdomain.conf b/swag/nginx/proxy-confs/transmission.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/transmission.subdomain.conf rename to swag/nginx/proxy-confs/transmission.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/wallabag.subdomain.conf b/swag/nginx/proxy-confs/wallabag.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/wallabag.subdomain.conf rename to swag/nginx/proxy-confs/wallabag.subdomain.conf diff --git a/letsencrypt/nginx/proxy-confs/wg.subdomain.conf b/swag/nginx/proxy-confs/wg.subdomain.conf similarity index 100% rename from letsencrypt/nginx/proxy-confs/wg.subdomain.conf rename to swag/nginx/proxy-confs/wg.subdomain.conf diff --git a/letsencrypt/nginx/site-confs/default b/swag/nginx/site-confs/default similarity index 100% rename from letsencrypt/nginx/site-confs/default rename to swag/nginx/site-confs/default diff --git a/letsencrypt/letsencrypt.env b/swag/swag.env similarity index 100% rename from letsencrypt/letsencrypt.env rename to swag/swag.env