Merge pull request #7 from QuLogic/group

Group things into subdirectories

Author: tacaswell

.github/workflows/lint.yml

@@ -48,10 +48,10 @@ jobs:
         uses: reviewdog/action-setup@v1
 
       - name: Run caddy validate
-        run: caddy validate
+        run: caddy validate --config caddy/Caddyfile
 
       - name: Run caddy fmt
-        run: caddy fmt --overwrite
+        run: caddy fmt --overwrite caddy/Caddyfile
 
       - name: Run reviewdog
         uses: reviewdog/action-suggester@v1

.github/workflows/tests.yml

@@ -19,9 +19,9 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install -r dev-requirements.txt
+          pip install -r webhook/dev-requirements.txt
           git config --global user.name "GitHub CI Bot"
           git config --global user.email "noone@example.com"
 
       - name: Run tests
-        run: pytest
+        run: pytest webhook

Makefile

@@ -6,14 +6,14 @@ serve:
 	mkdir -p sites
 	$(RUNTIME) run --rm -it \
 	    -v $$PWD/sites:/srv:Z \
-	    -v $$PWD/Caddyfile:/etc/caddy/Caddyfile:ro,Z \
+	    -v $$PWD/caddy/Caddyfile:/etc/caddy/Caddyfile:ro,Z \
 	    -e SITE_DIR=/srv \
 	    -p 2015:2015 \
 	    $(CADDY_IMAGE):$(CADDY_VERSION) \
 	    caddy run --config /etc/caddy/Caddyfile --watch
 
 fmt:
 	$(RUNTIME) run --rm -it \
-	    -v $$PWD/Caddyfile:/etc/caddy/Caddyfile:Z \
+	    -v $$PWD/caddy/Caddyfile:/etc/caddy/Caddyfile:Z \
 	    $(CADDY_IMAGE):$(CADDY_VERSION) \
 	    caddy fmt --overwrite /etc/caddy/Caddyfile