From bde8858ef9a679198456ee1c88756c964900fae9 Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Wed, 7 Feb 2024 22:13:52 +0100 Subject: [PATCH] master=>main --- .github/workflows/bouncer.yml | 2 +- php/apache/ApacheConfig.conf | 4 ++-- redis/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bouncer.yml b/.github/workflows/bouncer.yml index 1e51a33..38a00cf 100644 --- a/.github/workflows/bouncer.yml +++ b/.github/workflows/bouncer.yml @@ -7,7 +7,7 @@ permissions: on: push: branches: - - master + - main paths: - bouncer/** - .github/workflows/bouncer.yml diff --git a/php/apache/ApacheConfig.conf b/php/apache/ApacheConfig.conf index f9e3299..cac7ef4 100644 --- a/php/apache/ApacheConfig.conf +++ b/php/apache/ApacheConfig.conf @@ -8,9 +8,9 @@ # However, you must set it for any further virtual host explicitly. #ServerName www.example.com - ServerAdmin webmaster@localhost + ServerAdmin admin@localhost DocumentRoot /app/public - + AllowOverride All diff --git a/redis/README.md b/redis/README.md index 7818268..257990d 100644 --- a/redis/README.md +++ b/redis/README.md @@ -1,5 +1,5 @@ # Redis -[![Build Status](https://travis-ci.org/benzine-framework/docker-redis.svg?branch=master)](https://travis-ci.org/benzine-framework/docker-redis) +[![Build Status](https://travis-ci.org/benzine-framework/docker-redis.svg?branch=main)](https://travis-ci.org/benzine-framework/docker-redis) A fork of the redis docker image that tracks upstream and implements a default healthcheck