Merge Test to preprod

• Readme fixes
• z-push!9 (merged) fix

README.md

@@ -114,23 +114,23 @@ oc new-app \
 ## Create the different mounts/shares
 
 In the following commands, replace <name> by:
-   - For `test`: `dc/zpush-test`
-   - For `master`: `dc/zpush`
+   - For `test`: `zpush-test`
+   - For `master`: `zpush`
 
 - Create empty dirs for logs:
-  ```oc set volumes <name> --add=true --name=zpush-log -m /var/log/z-push/```
+  ```oc set volumes dc/<name> --add=true --name=zpush-log -m /var/log/z-push/```
 - HTTP configuration:
   ````
-  oc set volumes <name> --add=true --name=httpd-config -t configmap --default-mode 422 \
+  oc set volumes dc/<name> --add=true --name=httpd-config -t configmap --default-mode 422 \
     --configmap-name='httpd-config' --sub-path='z-push.conf' -m /etc/httpd/conf.d/z-push.conf
   ```
 - Z-push configuration
   - Add volume:
   ```
-  oc patch <name> -p '{"spec": { "template": { "spec": {"volumes": [{"name": \
+  oc patch dc/<name> -p '{"spec": { "template": { "spec": {"volumes": [{"name": \
   "zpush-config", "configMap": {"defaultMode": 422, "name": "zpush-config"}}]}}}}'
   ```
-  - Add mounts (be careful of the <name> in the middle):
+  - Add mounts (be careful of the two <name> in the middle):
   ```
     for x in z-push.conf.php:/opt/app-root/src/config.php \
              caldav.conf.php:/opt/app-root/src/backend/caldav/config.php \
@@ -140,7 +140,7 @@ In the following commands, replace <name> by:
              imap.conf.php:/opt/app-root/src/backend/imap/config.php \
              state-sql.conf.php:/opt/app-root/src/backend/sqlstatemachine/config.php \
              policies.ini:/opt/app-root/src/policies.ini; do \
-        oc patch dc/zpush-test -p "{\"spec\": { \"template\": { \"spec\": { \
+        oc patch dc/<name> -p "{\"spec\": { \"template\": { \"spec\": { \
              \"containers\": [{\"name\": \"<name>\", \"volumeMounts\": \
              [{\"name\": \"zpush-config\", \"mountPath\": \"${x/*:/}\", \
              \"subPath\": \"${x/:*/}\"}]}]}}}}"; \
@@ -154,7 +154,7 @@ In the following commands, replace <name> by:
   - For `master`: ```oc patch svc/zpush --type json -p '[{"op": "remove", "path":"/spec/ports/1"}]'```
 - Delete silly port 8443 from deployment config with:
   - For `test`: ```oc patch dc/zpush-test --type json  -p '[{"op": "remove", "path":"/spec/template/spec/containers/0/ports/1"}]'```
-  - For `master`: ```oc patch dc/zpush-test --type json  -p '[{"op": "remove", "path":"/spec/template/spec/containers/0/ports/1"}]'```
+  - For `master`: ```oc patch dc/zpush --type json  -p '[{"op": "remove", "path":"/spec/template/spec/containers/0/ports/1"}]'```
 - Create the route with:
   - For `tesŧ`: ```oc create route edge --insecure-policy=Redirect --service='svc/zpush-test'```
   - For `master`: ```oc create route edge --insecure-policy=Redirect --service='svc/zpush'```
@@ -165,7 +165,7 @@ In the following commands, replace <name> by:
   - `oc annotate route/zpush 'router.cern.ch/network-visibility=Internet'`
 
 - Restrict the route to the intranet:
-  - `oc annotate route/zpush 'router.cern.ch/network-visibility=Intranet'\
+  - `oc annotate route/zpush 'router.cern.ch/network-visibility=Intranet'`
 
 
 ## Re-build the custom builder