diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-08-10 00:16:45 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-08-10 00:16:45 +0900 |
| commit | 93ce7c963e62dbeff414c81c7969ffcf61d5394b (patch) | |
| tree | 901057cc1b51b547e010755a9f267c855d453e16 | |
| parent | df88cf6d9c5bcf06b610513e3a403ad6d73211da (diff) | |
| parent | 4d77e381566613b37310c8257fc359fb3b23a3ac (diff) | |
| download | nil.ninja-93ce7c963e62dbeff414c81c7969ffcf61d5394b.tar.gz nil.ninja-93ce7c963e62dbeff414c81c7969ffcf61d5394b.tar.zst nil.ninja-93ce7c963e62dbeff414c81c7969ffcf61d5394b.zip | |
Merge branch 'feat/albatross-swift'
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | mioproxy.prod.hcl | 11 | ||||
| m--------- | vhosts/t/albatross-swift | 0 |
4 files changed, 20 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index 03f00fd..3150cf7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vhosts/t/albatross"] path = vhosts/t/albatross url = git@github.com:nsfisis/phperkaigi-2024-albatross.git +[submodule "vhosts/t/albatross-swift"] + path = vhosts/t/albatross-swift + url = git@github.com:nsfisis/iosdc-japan-2024-albatross.git @@ -10,14 +10,17 @@ provision: .PHONY: build build: - cd vhosts/t/albatross; make -f Makefile.prod build + # cd vhosts/t/albatross; make -f Makefile.prod build + cd vhosts/t/albatross-swift; make -f Makefile.prod build .PHONY: serve serve: sudo systemctl start mioproxy - cd vhosts/t/albatross; make -f Makefile.prod serve + # cd vhosts/t/albatross; make -f Makefile.prod serve + cd vhosts/t/albatross-swift; make -f Makefile.prod serve .PHONY: clean clean: - cd vhosts/t/albatross; make -f Makefile.prod clean + cd vhosts/t/albatross-swift; make -f Makefile.prod clean + # cd vhosts/t/albatross; make -f Makefile.prod clean sudo systemctl stop mioproxy diff --git a/mioproxy.prod.hcl b/mioproxy.prod.hcl index c2518d3..c7e0190 100644 --- a/mioproxy.prod.hcl +++ b/mioproxy.prod.hcl @@ -27,4 +27,15 @@ server https { port = 8001 } } + + proxy albatross-swift { + from { + host = "t.nil.ninja" + path = "/iosdc-japan/2024/code-battle/" + } + to { + host = "127.0.0.1" + port = 8002 + } + } } diff --git a/vhosts/t/albatross-swift b/vhosts/t/albatross-swift new file mode 160000 +Subproject b450648caa0d1bd5c91e67a33153bbacaf57f00 |