fix: hugo setup

Author: keskiju

CONFIGURATION.md

@@ -69,11 +69,11 @@ The client GUI uses [Material-UI](https://material-ui-next.com/) component libra
 
 ## Remote environments
 
-You create the other environments just like you did the dev environment. However, you don't need to write down the basic auth credentials anymore, since you can reuse the same credentials as in dev environment.
+You can create the other environments just like you did the dev environment. However, you don't need to write down the basic auth credentials anymore, since you can reuse the same credentials as in dev environment.
 
-Examples for environment names: `f-orders`, `dev`, `test`, `stag`, `canary`, `prod`. You configure project environments with `taito_environments` setting in `taito-config.sh`.
+Project environments are configured in `taito-config.sh` with the `taito_environments` setting. Examples for environment names: `f-orders`, `dev`, `test`, `stag`, `canary`, `prod`.
 
-See [6. Remote environments](https://github.com/TaitoUnited/taito-cli/blob/master/docs/tutorial/05-remote-environments.md) chapter of Taito CLI tutorial for more thorough instructions.
+See [remote environments](https://taitounited.github.io/taito-cli/tutorial/05-remote-environments) chapter of Taito CLI tutorial for more thorough instructions.
 
 Operations on production and staging environments usually require admin rights. Please contact DevOps personnel if necessary.
 
@@ -100,7 +100,7 @@ Operations on production and staging environments usually require admin rights.
 
 **Static site generator (www):** See [www/README.md](www/README.md) for configuration instructions. You can use static site generator e.g. for user guides or API documentation.
 
-**Custom provider:** If you cannot use Docker containers on your remote environments, you can customize the deployment with a custom provider. Instead of deploying the application as docker container images, you can, for example, deploy the application as WAR or EAR packages on a Java application server, or install everything directly on the remote host. You can enable the custom provider with the `taito_provider` setting in `taito-config.sh` and implement [custom deployment scripts](https://github.com/TaitoUnited/SERVER-TEMPLATE/blob/master/scripts/custom-provider) yourself.
+**Custom provider:** If you cannot use Docker containers on your remote environments, you can customize the deployment with a custom provider. Instead of deploying the application as docker container images, you can, for example, deploy the application as WAR or EAR packages on a Java application server, or install everything directly on the remote host. You can enable the custom provider by setting `taito_provider=custom` in `taito-config.sh` and by implementing [custom deployment scripts](https://github.com/TaitoUnited/SERVER-TEMPLATE/blob/master/scripts/custom-provider) yourself.
 
 ## Kubernetes
 
@@ -114,7 +114,7 @@ You can deploy configuration changes without rebuilding with the `taito deployme
 
 You can add a new secret like this:
 
-1. Add a secret definition to the `taito_secrets` setting in `taito-config.sh`.
+1. Add a secret definition to the `taito_secrets` or the `taito_remote_secrets` setting in `taito-config.sh`.
 2. Map the secret definition to a secret in `docker-compose.yaml` for Docker Compose and in `scripts/helm.yaml` for Kubernetes.
 3. Run `taito env rotate:ENV SECRET` to generate a secret value for an environment. Run the command for each environment separately. Note that the rotate command restarts all pods in the same namespace.
 

docker-compose.yaml

@@ -159,7 +159,7 @@ services:
     volumes:
       - "./www:${DC_PATH}/service:delegated"
       - "${DC_PATH}/service/node_modules"
-      - "${DC_PATH}/service/site/node_modules"
+      - "${DC_PATH}/service/site/node_modules" # FOR GATSBY ONLY
       # FOR GATSBY ONLY:
       # - "/service/site/node_modules"
     environment:

scripts/taito-template/init.sh

@@ -12,8 +12,8 @@ sed -i "s/ function / /" taito-config.sh
 
 # Remote the example site
 rm -rf www/site
-sed -i '/    - "\/service\/site\/node_modules"/d' docker-compose.yaml
-sed -i '/    - "\/service\/site\/node_modules"/d' docker-compose-remote.yaml
+sed -i '/\/site\/node_modules" # FOR GATSBY ONLY/d' docker-compose.yaml
+sed -i '/\/site\/node_modules" # FOR GATSBY ONLY/d' docker-compose-remote.yaml
 
 echo
 echo "######################"

www/README.md

@@ -8,7 +8,6 @@ Remove static site generators that you do not use from `www/install.sh`.
 
 Start containers, and start a shell inside the www Docker container:
 
-    taito env apply
     taito start
     taito shell:www
 

www/develop.sh

@@ -3,10 +3,7 @@
 
 set -x
 
-if [ ! -d ./site ]; then
-  # No site yet. Just keep container running.
-  tail -f /dev/null
-elif [ -f ./site/package.json ]; then
+if [ -f ./site/package.json ]; then
   # Gatsby development
   cd /service/site && \
   npm install && \
@@ -16,12 +13,15 @@ elif [ -f ./site/Gemfile ]; then
   cd /service/site && \
   bundle update && \
   bundle exec jekyll serve --host 0.0.0.0 --port 8080 \
-    --baseurl "http://localhost:$COMMON_PUBLIC_PORT" \
-    --livereload --livereload-port "$COMMON_PUBLIC_PORT"
-else
+    --baseurl "http://localhost:${COMMON_PUBLIC_PORT}" \
+    --livereload --livereload-port "${COMMON_PUBLIC_PORT}"
+elif [ -f ./site/config.toml ]; then
   # Hugo development
   cd /service/site && \
   hugo server -D --bind=0.0.0.0 --port 8080 \
-    --baseURL "http://localhost:$COMMON_PUBLIC_PORT" --appendPort=false \
-    --liveReloadPort "$COMMON_PUBLIC_PORT"
+    --baseURL "http://localhost:${COMMON_PUBLIC_PORT}" --appendPort=false \
+    --liveReloadPort "${COMMON_PUBLIC_PORT}"
+else
+  echo "develop.sh: No site yet at www/site. Just keep the container running."
+  tail -f /dev/null
 fi