Merge pull request #1603 from pixelfed/staging

Allow redis to be used over a UNIX socket

.env.example

@@ -25,6 +25,7 @@ SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 QUEUE_DRIVER=redis
 
+REDIS_SCHEME=tcp
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

.env.testing

@@ -25,6 +25,7 @@ SESSION_DRIVER=redis
 SESSION_LIFETIME=120
 QUEUE_DRIVER=redis
 
+REDIS_SCHEME=tcp
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

app/Place.php

@@ -7,15 +7,8 @@ use Pixelfed\Snowflake\HasSnowflakePrimary;
 
 class Place extends Model
 {
-	use HasSnowflakePrimary;
+	protected $visible = ['id', 'name', 'country', 'slug'];
 
-    /**
-     * Indicates if the IDs are auto-incrementing.
-     *
-     * @var bool
-     */
-    public $incrementing = false;
-    
 	public function url()
 	{
 		return url('/discover/places/' . $this->id . '/' . $this->slug);
@@ -30,4 +23,9 @@ class Place extends Model
 	{
 		return $this->posts()->count();
 	}
+
+	public function statuses()
+	{
+		return $this->hasMany(Status::class, 'id', 'place_id');
+	}
 }

config/cache.php

@@ -73,6 +73,8 @@ return [
             'client' => 'predis',
 
             'default' => [
+                'scheme'   => env('REDIS_SCHEME', 'tcp'),
+                'path'     => env('REDIS_PATH'),
                 'host'     => env('REDIS_HOST', 'localhost'),
                 'password' => env('REDIS_PASSWORD', null),
                 'port'     => env('REDIS_PORT', 6379),

config/database.php

@@ -109,6 +109,8 @@ return [
         'client' => 'predis',
 
         'default' => [
+            'scheme'   => env('REDIS_SCHEME', 'tcp'),
+            'path'     => env('REDIS_PATH'),
             'host'     => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
             'port'     => env('REDIS_PORT', 6379),