Remove var for switching between php

README.md

@@ -17,7 +17,6 @@ docker create \
   -v <path to data>:/config \
   -e PGID=<gid> -e PUID=<uid>  \
   -p 80:80 \
-  -e fpm="false" `#optional` \
   -e branch="v2-master" `#optional` \
   organizr/organizr
 ```
@@ -34,7 +33,6 @@ The parameters are split into two halves, separated by a colon, the left hand si
 * `-v /config` - Mapping the config files for Organizr
 * `-e PGID` Used for GroupID - see below for explanation
 * `-e PUID` Used for UserID - see below for explanation
-* `-e fpm` Used to enable php to use the socket rather than TCP, often increases performance. Valid values are(comma separated) `true, false`
 * `-e branch` Used to switch between branches of organizr. Valid values are(comma separated) `v2-master, master, v2-develop, develop, dev`. v2-master and master will yield the v2-master branch. v2-develop, develop and dev will yield the v2-develop branch
 
 It is based on Alpine Linux with an s6 overlay.
@@ -76,14 +74,14 @@ Key-changes:
 
 * Moving the install directory from `/config/www/Dashboard` to `/config/www/organizr`, Nginx should also be updated with this change.
 
-* One tag. While we could have set PHP to use the unix socket as default, we opted to using a environment varible. We also moved the branch selector to be a environment variable.
+* One tag. ~~While we could have set PHP to use the unix socket as default, we opted to using a environment varible~~ We have now set up to use the unix socket exclusively. We also moved the branch selector to be a environment variable.
 
 | Old | New |
 | ---- | --- |
 | `organizrtools/organizr-v2` | `organizr/organizr` |
 | `organizrtools/organizr-v2:dev` | `-e branch=dev organizr/organizr` |
-| `organizrtools/organizr-v2:php-fpm` | `-e fpm=true organizr/organizr` |
-| `organizrtools/organizr-v2:dev-php-fpm` | `-e branch=dev -e fpm=true organizr/organizr` |
+| `organizrtools/organizr-v2:php-fpm` | `organizr/organizr` |
+| `organizrtools/organizr-v2:dev-php-fpm` | `-e branch=dev organizr/organizr` |
 
 * `organizrtools/organizr-v2:plex` and `organizrtools/organizr-v2:dev-plex` does not have a migration path.
 

organizr.xml

@@ -17,7 +17,6 @@
     <DonateLink>https://paypal.me/causefx</DonateLink>
     <Description>HTPC/Homelab Services Organizer - Written in PHP</Description>
     <Config Name="Branch" Target="branch" Default="master|develop" Description="Chooses which branch of organizr you wish to use" Type="Variable" Display="always" Required="false" Mask="false">master</Config>
-    <Config Name="Fpm" Target="fpm" Default="false|true" Description="Sets the required changes to use php over a unix socket" Type="Variable" Display="advanced" Required="false" Mask="false"/>
     <Config Name="WebUI" Target="80" Default="" Mode="tcp" Description="Container Port: 80" Type="Port" Display="always" Required="false" Mask="false"/>
     <Config Name="AppData Config Path" Target="/config" Default="/mnt/user/appdata/organizr" Mode="rw" Description="Container Path: /config" Type="Path" Display="advanced" Required="true" Mask="false"/>
     <Config Name="PUID" Target="PUID" Default="99" Mode="" Description="Variable: PUID" Type="Variable" Display="advanced-hide" Required="true" Mask="false">99</Config>

root/defaults/default

@@ -1,4 +1,4 @@
-# V0.0.4
+# V0.0.5
 server {
   listen 80 default_server;
   root /config/www/organizr;
@@ -28,7 +28,7 @@ server {
 
   location ~ \.php$ {
     fastcgi_split_path_info ^(.+\.php)(/.+)$;
-    fastcgi_pass 127.0.0.1:9000;
+    fastcgi_pass unix:/var/run/php7-fpm.sock;
     fastcgi_index index.php;
     include /etc/nginx/fastcgi_params;
     fastcgi_buffers 32 32k;