[plugins] Use relative paths or env variables in configs DEV-1272 (#382)

## Summary

@Lagoja called out that we were using absolute paths in conf files.
Since the conf files are checked-in, they need to be env variables or
relative paths if the file doesn't support env variables.

I also added `services restart` which really helped me test this out.

## How was it tested?

```
devbox add nginx apacheHttpd php
devbox services start
curl localhost
curl localhost:8080
curl localhost:8080/index.php
```

Author: mikeland73

internal/boxcli/services.go

@@ -49,8 +49,17 @@ func ServicesCmd() *cobra.Command {
 		},
 	}
 
+	restartCommand := &cobra.Command{
+		Use:   "restart [service]...",
+		Short: "Restarts service. If no service is specified, restarts all services",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return restartServices(cmd, args, flags)
+		},
+	}
+
 	flags.config.register(servicesCommand)
 	servicesCommand.AddCommand(lsCommand)
+	servicesCommand.AddCommand(restartCommand)
 	servicesCommand.AddCommand(startCommand)
 	servicesCommand.AddCommand(stopCommand)
 	return servicesCommand
@@ -118,3 +127,12 @@ func serviceNames(box devbox.Devbox) ([]string, error) {
 	}
 	return names, nil
 }
+
+func restartServices(
+	cmd *cobra.Command,
+	services []string,
+	flags servicesCmdFlags,
+) error {
+	_ = stopServices(cmd, services, flags)
+	return startServices(cmd, services, flags)
+}

internal/plugin/pkgcfg.go

@@ -71,6 +71,7 @@ func (m *Manager) CreateFilesAndShowReadme(pkg, rootDir string) error {
 		}
 		var buf bytes.Buffer
 		if err = t.Execute(&buf, map[string]string{
+			"DevboxConfigDir":      rootDir,
 			"DevboxDir":            filepath.Join(rootDir, devboxDirName, pkg),
 			"DevboxDirRoot":        filepath.Join(rootDir, devboxDirName),
 			"DevboxProfileDefault": filepath.Join(rootDir, nix.ProfilePath),
@@ -144,6 +145,7 @@ func buildConfig(pkg, rootDir, content string) (*config, error) {
 	}
 	var buf bytes.Buffer
 	if err = t.Execute(&buf, map[string]string{
+		"DevboxConfigDir":      rootDir,
 		"DevboxDir":            filepath.Join(rootDir, devboxDirName, pkg),
 		"DevboxDirRoot":        filepath.Join(rootDir, devboxDirName),
 		"DevboxProfileDefault": filepath.Join(rootDir, nix.ProfilePath),

plugins/apache/httpd.conf

@@ -26,8 +26,8 @@ LoadModule alias_module modules/mod_alias.so
     Require all denied
 </Directory>
 
-DocumentRoot  "{{ .DevboxDirRoot }}/web"
-<Directory "{{ .DevboxDirRoot }}/web">
+DocumentRoot  "${HTTPD_CONFDIR}/../web"
+<Directory "${HTTPD_CONFDIR}/../web">
     Options Indexes FollowSymLinks
     AllowOverride None
     Require all granted
@@ -36,7 +36,7 @@ DocumentRoot  "{{ .DevboxDirRoot }}/web"
 <Files ".ht*">
     Require all denied
 </Files>
-ErrorLog "${HTTPD_CONFDIR}/error.log"
+ErrorLog "${HTTPD_ERROR_LOG_FILE}"
 <IfModule headers_module>
     RequestHeader unset Proxy early
 </IfModule>
@@ -46,9 +46,9 @@ ErrorLog "${HTTPD_CONFDIR}/error.log"
     ServerName  php_localhost
 
     UseCanonicalName    Off
-    DocumentRoot "{{ .DevboxDirRoot }}/web"
+    DocumentRoot "${HTTPD_CONFDIR}/../web"
 
-    <Directory "{{ .DevboxDirRoot }}/web">
+    <Directory "${HTTPD_CONFDIR}/../web">
         Options All
         AllowOverride All
         <IfModule mod_authz_host.c>
@@ -57,7 +57,7 @@ ErrorLog "${HTTPD_CONFDIR}/error.log"
     </Directory>
 
     ## Added for php-fpm
-    ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:8082/{{ .DevboxDirRoot }}/web/$1
+    ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:8082/${HTTPD_DEVBOX_CONFIG_DIR}/devbox.d/web/$1
     DirectoryIndex index.html 
 
 </VirtualHost>

plugins/apacheHttpd.json

@@ -3,7 +3,9 @@
   "version": "0.0.1",
   "readme": "If you with to edit the config file, please copy it out of the .devbox directory.",
   "env": {
+    "HTTPD_DEVBOX_CONFIG_DIR": "{{ .DevboxConfigDir }}",
     "HTTPD_CONFDIR": "{{ .DevboxDir }}",
+    "HTTPD_ERROR_LOG_FILE": "{{ .Virtenv }}/error.log",
     "HTTPD_PORT": "8080"
   },
   "create_files": {

plugins/nginx/nginx.conf

@@ -4,7 +4,7 @@ server {
          listen       80;
          listen       [::]:80;
          server_name  localhost;
-         root         {{ .DevboxDirRoot }}/web;
+         root         ../../../devbox.d/web;
 
          error_log error.log error;
          access_log access.log;

plugins/php.json

@@ -4,6 +4,8 @@
   "match": "^php[0-9]*$",
   "readme": "PHP is compiled with default extensions. If you would like to use non-default extensions you can add them with devbox add php81Extensions.{extension} . For example, for the memcache extension you can do `devbox add php81Extensions.memcached`.",
   "env": {
+    "PHPFPM_ERROR_LOG_FILE": "{{ .Virtenv }}/php-fpm.log",
+    "PHPFPM_PID_FILE": "{{ .Virtenv }}/php-fpm.log",
     "PHPFPM_PORT": "8082"
   },
   "create_files": {

plugins/php/php-fpm.conf

@@ -1,6 +1,6 @@
 [global]
-pid = {{ .Virtenv }}/php-fpm.pid
-error_log = {{ .Virtenv }}/php-fpm.log
+pid = ${PHPFPM_PID_FILE}
+error_log = ${PHPFPM_ERROR_LOG_FILE}
 daemonize = yes
 
 [www]