Skip to content

Commit

Permalink
Merge pull request #85 from Orbitale/caddy
Browse files Browse the repository at this point in the history
Embed Caddy server into Rymfony
  • Loading branch information
Pierstoval committed Nov 5, 2021
2 parents 5ff8327 + b135c6a commit 4fcb2eb
Show file tree
Hide file tree
Showing 19 changed files with 485 additions and 2,257 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ jobs:
run: |
echo "nightly ${{ steps.vars.outputs.GITHUB_SHA_SHORT }} ${{ steps.vars.outputs.RELEASE_OS }} (${{ steps.vars.outputs.RELEASE_DATE }})" > build_metadata.txt
- name: (Mac only) Install "coreutils" to be able to get file hash
if: runner.os == 'macOS'
run: |
brew install coreutils
- name: 🛒 Download Caddy
run: |
bin/download_caddy.bash
- name: 🏗 Build
run: |
cat build_metadata.txt
Expand Down Expand Up @@ -189,6 +198,10 @@ jobs:
run: |
echo "nightly ${{ steps.vars.outputs.GITHUB_SHA_SHORT }} ${{ steps.vars.outputs.RELEASE_OS }} (${{ steps.vars.outputs.RELEASE_DATE }})" > build_metadata.txt
- name: 🛒 Download Caddy
run: |
bin/download_caddy.ps1
- name: 🏗 Build
run: |
cat build_metadata.txt
Expand Down
14 changes: 8 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/bin/caddy
/bin/caddy.*
/build.err
/build.log
/target
certs/*
!certs/generate_certificates.sh
.fpm.pid
.pid
_local_logs.txt
/certs/*
/!certs/generate_certificates.sh
/_local_logs.txt
/tests/workdir/
server.log
/server.log
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v0.3.0

* Embed Caddy server into Rymfony, instead of using Warp (by @Pierstoval in https://github.com/Orbitale/Rymfony/pull/85)

# v0.2.3

* Allow to run php-fpm (and by extension Rymfony itself) as root by @Shine-neko in #86
Expand Down
Loading

0 comments on commit 4fcb2eb

Please sign in to comment.