Go back to Caddyfile (instead of caddy.conf)

Addresses #4

5 files changed, 35 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f18f8b4ee51f..854ea7e0e018 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,7 @@ pkgbase = caddy2
 	source = caddy.tmpfiles
 	source = caddy.sysusers
 	source = caddy.conf
-	source = WarningCaddyfile
+	source = Caddyfile
 	validpgpkeys = 29D0817A67156E4F25DC24782A349DD577D586A5
 	sha512sums = SKIP
 	sha512sums = 2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4
@@ -27,8 +27,8 @@ pkgbase = caddy2
 	sha512sums = eeb352e023331a3e3d88e47cc52f8786864abeb66bccc864d2557722afd54bdfcee9781590c3cf204923c8c0fa37029ba417a6a65ccd5569f8cbc214eb3ce642
 	sha512sums = 41d6b82ab99ca729d5b48d77d4557f3c5368b63847054216018547ea40e0cc302bc36668e9a57ba63e8983205febffee18eae1c306a665365a13da54010cd415
 	sha512sums = a9b3e4af421a4be0193d9a452cdf6b66b8f03fbf8bce3de4454a2ee70556c156c458b12a141fefb3e15a2acbb0f3acedc09cbccbecf82aa8916b9b6d799ec066
+	sha512sums = 6905c3ed603aef35889212d9c92d04967af64abbb777528a30996e8570b0716c6fb3fb2a5697d3df50e25c67ef0c9665b5e2b0e34fbae07dad002e54553bce58
 	sha512sums = 399c177475e299bf5736dba1a9d045477072594390b73c7dd2e13e12785abe029d48e480aee98216f7a8735addd353ce4a07b56ed14364f641b138e4fca0ebcd
-	sha512sums = e195d235a8893d27277a88554a8786e7aec2ca6c83855e051adbdfe5463409463cd159aac2db09786270259be9280eafa0a0ed5dfd2e04d587c8136856ea4d4c
 
 pkgname = caddy2
 
diff --git a/Caddyfile b/Caddyfile
new file mode 100644
index 000000000000..1aec2b840bae
--- /dev/null
+++ b/Caddyfile
@@ -0,0 +1,28 @@
+# The Caddyfile is an easy way to configure your Caddy web server.
+#
+# Unless the file starts with a global options block, the first
+# uncommented line is always the address of your site.
+#
+# To use your own domain name (with automatic HTTPS), first make
+# sure your domain's A/AAAA DNS records are properly pointed to
+# this machine's public IP, then replace the line below with your
+# domain name.
+:80
+
+# Set this path to your site's directory.
+root * /usr/share/caddy
+
+# Enable the static file server.
+file_server
+
+# Import additional caddy config files in /etc/caddy/conf.d/
+import /etc/caddy/conf.d/*
+
+# Another common task is to set up a reverse proxy:
+# reverse_proxy localhost:8080
+
+# Or serve a PHP site through php-fpm:
+# php_fastcgi localhost:9000
+
+# Refer to the Caddy docs for more information:
+# https://github.com/caddyserver/caddy/wiki/v2:-Documentation
diff --git a/PKGBUILD b/PKGBUILD
index f7ea5200cf33..749bdc656b27 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,15 +25,15 @@ source=("git+https://github.com/caddyserver/caddy#tag=${_tag}?signed"
         caddy.tmpfiles
         caddy.sysusers
         caddy.conf
-        WarningCaddyfile)
+        Caddyfile)
 sha512sums=('SKIP'
             '2abccd41f770daebf61285dc017249f20c707877ea3c870f4a2375bbbd2bf481a8652d1fd3c7afd7d6b5c54838e9d8474a33e2c9790ef67dcf9d79c4e52953b4'
             '69a619f2be6df77ac516621ad7b27dd6adde0b40cf4680c3afb25e94ac7c1cd6afb42a650d47a4fb096503dec85988af08e85a617b5290cf3a3d9b50b2e2ec46'
             'eeb352e023331a3e3d88e47cc52f8786864abeb66bccc864d2557722afd54bdfcee9781590c3cf204923c8c0fa37029ba417a6a65ccd5569f8cbc214eb3ce642'
             '41d6b82ab99ca729d5b48d77d4557f3c5368b63847054216018547ea40e0cc302bc36668e9a57ba63e8983205febffee18eae1c306a665365a13da54010cd415'
             'a9b3e4af421a4be0193d9a452cdf6b66b8f03fbf8bce3de4454a2ee70556c156c458b12a141fefb3e15a2acbb0f3acedc09cbccbecf82aa8916b9b6d799ec066'
-            '399c177475e299bf5736dba1a9d045477072594390b73c7dd2e13e12785abe029d48e480aee98216f7a8735addd353ce4a07b56ed14364f641b138e4fca0ebcd'
-            'e195d235a8893d27277a88554a8786e7aec2ca6c83855e051adbdfe5463409463cd159aac2db09786270259be9280eafa0a0ed5dfd2e04d587c8136856ea4d4c')
+            '6905c3ed603aef35889212d9c92d04967af64abbb777528a30996e8570b0716c6fb3fb2a5697d3df50e25c67ef0c9665b5e2b0e34fbae07dad002e54553bce58'
+            '399c177475e299bf5736dba1a9d045477072594390b73c7dd2e13e12785abe029d48e480aee98216f7a8735addd353ce4a07b56ed14364f641b138e4fca0ebcd')
 validpgpkeys=(
   '29D0817A67156E4F25DC24782A349DD577D586A5' # Matthew Holt <mholt@users.noreply.github.com>
 )
@@ -45,7 +45,6 @@ pkgver() {
 
 prepare() {
   sed 's|/var/www/html|/srv/http|g' -i "${srcdir}/index-${_distcommit}.html"
-  sed 's|/etc/caddy/Caddyfile|/etc/caddy/caddy.conf|g' -i "${srcdir}/index-${_distcommit}.html"
 }
 
 build() {
@@ -75,5 +74,5 @@ package() {
   install -Dm 644 "${srcdir}/caddy.conf" "${pkgdir}/etc/caddy/caddy.conf"
   install -d "${pkgdir}/etc/caddy/conf.d"
   install -Dm 644 "${srcdir}/index-${_distcommit}.html" "${pkgdir}/usr/share/caddy/index.html"
-  install -Dm 644 "${srcdir}/WarningCaddyfile" "${pkgdir}/etc/caddy/Caddyfile"
+  install -Dm 644 "${srcdir}/Caddyfile" "${pkgdir}/etc/caddy/Caddyfile"
 }
diff --git a/WarningCaddyfile b/WarningCaddyfile
deleted file mode 100644
index 7539fc4a35d5..000000000000
--- a/WarningCaddyfile
+++ /dev/null
@@ -1 +0,0 @@
-# This file was moved to caddy.conf
\ No newline at end of file
diff --git a/caddy.conf b/caddy.conf
index 1aec2b840bae..a959bff9e3d2 100644
--- a/caddy.conf
+++ b/caddy.conf
@@ -1,28 +1 @@
-# The Caddyfile is an easy way to configure your Caddy web server.
-#
-# Unless the file starts with a global options block, the first
-# uncommented line is always the address of your site.
-#
-# To use your own domain name (with automatic HTTPS), first make
-# sure your domain's A/AAAA DNS records are properly pointed to
-# this machine's public IP, then replace the line below with your
-# domain name.
-:80
-
-# Set this path to your site's directory.
-root * /usr/share/caddy
-
-# Enable the static file server.
-file_server
-
-# Import additional caddy config files in /etc/caddy/conf.d/
-import /etc/caddy/conf.d/*
-
-# Another common task is to set up a reverse proxy:
-# reverse_proxy localhost:8080
-
-# Or serve a PHP site through php-fpm:
-# php_fastcgi localhost:9000
-
-# Refer to the Caddy docs for more information:
-# https://github.com/caddyserver/caddy/wiki/v2:-Documentation
+# This file was moved to Caddyfile
\ No newline at end of file