Serve dev and prod from same dir on server

freifunk-berlin · Dec 12, 2023 · 0f97662 · 0f97662
1 parent a273b2d
commit 0f97662
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -1,9 +1,9 @@
 name: Deploy website to dev server
 
 on:
- push:
-   branches-ignore:
-     - main
+  push:
+    branches-ignore:
+      - main
 
 jobs:
   deploy:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 public/
 .hugo_build.lock
 resources/_gen/
+www/
+www-dev/
diff --git a/apache/dev.website.conf b/apache/dev.website.conf
@@ -17,14 +17,14 @@
         SSLCertificateChainFile /etc/letsencrypt/live/dev.ff.berlin/chain.pem
         SSLCertificateKeyFile   /etc/letsencrypt/live/dev.ff.berlin/privkey.pem
 
-   	DocumentRoot /var/www/dev.berlin.freifunk.net/www/dev
+   	DocumentRoot /var/www/berlin.freifunk.net/www-dev
 
-   	<Directory "/var/www/dev.berlin.freifunk.net/www">
+   	<Directory "/var/www/berlin.freifunk.net/www-dev">
       		Options FollowSymLinks
       		AllowOverride None
       		Require all granted
    	</Directory>
 
-   	ErrorLog "/var/log/apache2/dev.berlin.freifunk.net-error.log"
-   	CustomLog "/var/log/apache2/dev.berlin.freifunk.net-access.log" combined
+   	ErrorLog "/var/log/apache2/berlin.freifunk.net-error.log"
+   	CustomLog "/var/log/apache2/berlin.freifunk.net-access.log" combined
 </VirtualHost>