diff --git a/.gitmodules b/.gitmodules index 6c29318..0515583 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,14 +1,17 @@ [submodule "repos/dotfiles"] path = repos/dotfiles - url = git@git.faulty.nl:didier/dotfiles + url = git@git.ixvd.net:didier/dotfiles [submodule "env"] path = env - url = git@git.faulty.nl:infra/env + url = git@git.ixvd.net:infra/env [submodule "repos/main-site"] - path = repos/main-site - url = git@git.faulty.nl:didier/site + path = repos/faulty-site + url = git@git.ixvd.net:didier/site [submodule "repos/backups"] path = repos/backups - url = git@git.faulty.nl:infra/backups + url = git@git.ixvd.net:infra/backups +[submodule "repos/ixvd-site"] + path = repos/ixvd-site + url = git@git.ixvd.net:this/site diff --git a/docker-compose.web.yml b/docker-compose.web.yml index 41b84fe..ec08e1b 100644 --- a/docker-compose.web.yml +++ b/docker-compose.web.yml @@ -1,9 +1,9 @@ version: '2.2' services: - web: + faulty-web: build: - context: ./repos/main-site + context: ./repos/faulty-site dockerfile: ./docker/latest.Dockerfile restart: always environment: @@ -12,6 +12,18 @@ services: networks: - proxy + ixvd-web: + build: + context: ./repos/ixvd-site + dockerfile: ./docker/latest.Dockerfile + restart: always + environment: + - VIRTUAL_HOST=ixvd.net + - LETSENCRYPT_HOST=ixvd.net + networks: + - proxy + + sh: build: context: ./repos/dotfiles diff --git a/repos/main-site b/repos/faulty-site similarity index 100% rename from repos/main-site rename to repos/faulty-site diff --git a/repos/ixvd-site b/repos/ixvd-site new file mode 160000 index 0000000..25efc48 --- /dev/null +++ b/repos/ixvd-site @@ -0,0 +1 @@ +Subproject commit 25efc48f3ebf7c50c04769f1c20e0d4a43dae7c7