fix custom php.ini, again

README.md

@@ -227,7 +227,7 @@ haze [match] edit <path>
 haze [match] reload
 ```
 
-The php configuration can edit changed with `haze edit /php.ini`
+The php configuration can edit changed with `haze edit  /config/php.ini`
 
 #### Checkout a branch for all local apps
 
@@ -273,10 +273,12 @@ proxy to allow using a wildcard domain.
 ### Setup
 
 - Set a DNS record for `*.haze.exmaple.com` and `haze.example.com` pointing to
-  `127.0.0.1` or your development machine if you need to access it from other devices.
+  `127.0.0.1` or your development machine if you need to access it from other
+  devices.
 - Set the `proxy` configuration with your domain and desired listen endpoint.
 - Set up a service to run `haze proxy` in the background as your own user. A
-  systemd user service is recommended (see [haze.service](./haze.service) for an example).
+  systemd user service is recommended (see [haze.service](./haze.service) for an
+  example).
 - Configure your reverse proxy of choice to proxy `*.haze.example.com` and
   `haze.example.com` to the proxy's listen endpoint
 - (optional) acquire a wildcard ssl certificate for your domain and set your

nix/image/bootstrap.sh

@@ -4,12 +4,12 @@ touch /var/log/nginx/access.log
 touch /var/log/nginx/error.log
 touch /var/log/cron/owncloud.log
 
-echo "# Options in here overwrite the builtin php.ini" > /php.ini
-echo "# xdebug.mode = debug" >> /php.ini
-echo "# xdebug.start_with_request = yes" >> /php.ini
-chmod 0777 /php.ini
+echo "# Options in here overwrite the builtin php.ini" > /config/php.ini
+echo "# xdebug.mode = debug" >> /config/php.ini
+echo "# xdebug.start_with_request = yes" >> /config/php.ini
+chmod 0777 /config/php.ini
 PHP_INI_DIR="$(php --ini | grep 'Scan' | cut -d ' ' -f7)"
-ln -s /php.ini "$PHP_INI_DIR/zz_extra.ini"
+ln -s /config/php.ini "$PHP_INI_DIR/zz_extra.ini"
 
 HAZE_UID=${HAZE_UID:-www-data}
 HAZE_GID=${HAZE_GID:-www-data}

src/args.rs

@@ -469,7 +469,7 @@ pub enum HazeCommand {
     Edit,
     /// Reload the php configuration in the instance
     #[strum(props(
-        Details = "note: you can overwrite <yellow>php.ini</yellow> settings with <literal>haze</literal> <arg>[filter]</arg> <literal>edit /php.ini</literal>"
+        Details = "note: you can overwrite <yellow>php.ini</yellow> settings with <literal>haze</literal> <arg>[filter]</arg> <literal>edit  /config/php.ini</literal>"
     ))]
     Reload,
 }

src/mapping.rs

@@ -161,7 +161,7 @@ pub fn default_mappings<'a>() -> impl IntoIterator<Item = Mapping<'a>> {
             .dont_create(),
         Mapping::new(WorkDir, "xdebug", "/tmp/xdebug"),
         Mapping::new(WorkDir, "profiling", "/tmp/profiling"),
-        Mapping::new(WorkDir, "php.ini", "/php.ini").file(),
+        Mapping::new(WorkDir, "php-config", "/config"),
     ];
     IntoIterator::into_iter(mappings)
 }