summaryrefslogtreecommitdiffstats
path: root/.examples
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2019-02-07 12:20:53 +0100
committerGitHub <noreply@github.com>2019-02-07 12:20:53 +0100
commitb9ae3256ad5a38f37f4f195ddf965f4b2f408615 (patch)
treea1401ac506bfbdb52530b82af442d1c9187105b8 /.examples
parent6d7be410e0a09a1a08e49762c7a7901e8bda49f3 (diff)
parente0de4ab28516a09423e5bb8630bfa93cf1de1bba (diff)
Merge pull request #600 from marceljd/redis-env-vars
Set Redis through environment variables
Diffstat (limited to '.examples')
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php8
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml1
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php8
-rw-r--r--.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml1
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php8
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml1
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php8
-rw-r--r--.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml1
8 files changed, 4 insertions, 32 deletions
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php
deleted file mode 100644
index b0cebe31..00000000
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/redis.config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => 'redis',
- 'port' => 6379,
- ),
-);
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
index 64c0570f..97c69299 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/docker-compose.yml
@@ -25,6 +25,7 @@ services:
- nextcloud:/var/www/html
environment:
- MYSQL_HOST=db
+ - REDIS_HOST=redis
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php
deleted file mode 100644
index b0cebe31..00000000
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/redis.config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => 'redis',
- 'port' => 6379,
- ),
-);
diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
index 424ef057..b48e54f1 100644
--- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/docker-compose.yml
@@ -23,6 +23,7 @@ services:
- nextcloud:/var/www/html
environment:
- MYSQL_HOST=db
+ - REDIS_HOST=redis
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php
deleted file mode 100644
index b0cebe31..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/app/redis.config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => 'redis',
- 'port' => 6379,
- ),
-);
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
index aaec5a2e..2c3f125e 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/apache/docker-compose.yml
@@ -26,6 +26,7 @@ services:
- LETSENCRYPT_HOST=
- LETSENCRYPT_EMAIL=
- MYSQL_HOST=db
+ - REDIS_HOST=redis
env_file:
- db.env
depends_on:
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php
deleted file mode 100644
index b0cebe31..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/app/redis.config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$CONFIG = array (
- 'memcache.locking' => '\OC\Memcache\Redis',
- 'redis' => array(
- 'host' => 'redis',
- 'port' => 6379,
- ),
-);
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
index 30aee4d9..fd2e5fc1 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb-cron-redis/fpm/docker-compose.yml
@@ -23,6 +23,7 @@ services:
- nextcloud:/var/www/html
environment:
- MYSQL_HOST=db
+ - REDIS_HOST=redis
env_file:
- db.env
depends_on: