Merge branch 'rztab' into 'master'

Update .gitlab-ci.yml

See merge request !16

.gitlab-ci.yml

@@ -63,8 +63,8 @@ pdf:
 pages:branches:
   stage: build
   script:
-    - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi
-    - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi
+    - if [ -f book.json ]; then jq -r --arg base_path "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/" '.base_path |= $base_path' book.json | sponge book.json; fi
+    - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi
     - 'if [ -f book.json ]; then cat book.json; fi'
     - gitbook install
     - gitbook build
@@ -82,8 +82,8 @@ pages:branches:
 pages:master:
   stage: build
   script:
-    - if [ -f book.json ]; then jq -r --arg base_path "/${CI_PROJECT_PATH}/" '.base_path |= $base_path' book.json | sponge book.json; fi
-    - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "/${CI_PROJECT_PATH}/book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi
+    - if [ -f book.json ]; then jq -r --arg base_path "${BASE_DIR}" '.base_path |= $base_path' book.json | sponge book.json; fi
+    - if [ -f book.json ]; then jq -r --arg pluginsConfig__downloadpdf_base "${BASE_DIR}book_pdf/book.pdf?/" '.pluginsConfig.downloadpdf.base |= $pluginsConfig__downloadpdf_base' book.json | sponge book.json; fi
     - 'if [ -f book.json ]; then cat book.json; fi'
     - gitbook install
     - gitbook build
@@ -119,7 +119,7 @@ review:start:
   - master
   environment:
     name: $CI_COMMIT_REF_NAME
-    url: https://${REVIEW_PROXY_HOST_NAME}/${REVIEW_BASE_DIR}/~${CI_COMMIT_REF_NAME}/
+    url: https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/
     on_stop: review:stop
   
 review:stop:
@@ -160,10 +160,8 @@ deploy:
         policy: pull   
     environment:
         name: $CI_COMMIT_REF_NAME
-        #url: http://$HOST_NAME$COLON$HTTP_PORT/production/
-        #url: https://$PROXY_HOST_NAME/$BASE_PATH/
-        #url: https://$PROXY_HOST_NAME/${BASE_DIR}/
-        url: https://fizban05.rz.tu-harburg.de/itbh/vortrag-kollaborieren-in-forschung-und-lehre/
+        url: https://$PROXY_HOST_NAME${BASE_DIR}
+        #url: https://$PROXY_HOST_NAME/
         
 clean:
   stage: clean
@@ -188,7 +186,7 @@ linkchecker:intern:
     name: linkchecker/linkchecker
     entrypoint: [""]
   script:
-    - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}/${REVIEW_BASE_DIR}/~${CI_COMMIT_REF_NAME}/
+    - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/
   when: manual
     
 linkchecker:all:
@@ -199,6 +197,6 @@ linkchecker:all:
     name: linkchecker/linkchecker
     entrypoint: [""]
   script:
-    - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --check-extern --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}/${REVIEW_BASE_DIR}/~${CI_COMMIT_REF_NAME}/
+    - linkchecker --recursion-level 10 --threads 10 --no-status --no-robots --no-warnings --check-extern --ignore-url 'https://fonts.gstatic.com/{0,1}$' https://${REVIEW_PROXY_HOST_NAME}${REVIEW_BASE_DIR}~${CI_COMMIT_REF_NAME}/
   when: manual