fix: ampersand with no quotes truncates echo output (#421)

[discourse_docker.git] / templates / postgres.template.yml

diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index b1337ebf2e4b7ab8df4aae932ccf67db3f02de64..681551cfeb704626930a82fba4ccebea58e992bc 100644 (file)
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -19,6 +19,7 @@ hooks:
        to: sv start postgres || exit 1
 
 run:
+  - exec: locale-gen $LANG && update-locale
   - exec: mkdir -p /shared/postgres_run
   - exec: chown postgres:postgres /shared/postgres_run
   - exec: chmod 775 /shared/postgres_run
@@ -35,7 +36,7 @@ run:
      contents: |
         #!/bin/sh
         exec 2>&1
-        HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
+        HOME=/var/lib/postgresql USER=postgres exec thpoff chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
 
   - file:
      path: /etc/service/postgres/log/run
@@ -61,12 +62,14 @@ run:
 
        if [ ! "10" = "$PG_MAJOR_OLD" ]; then
          echo Upgrading PostgreSQL from version ${PG_MAJOR_OLD} to 10
-         free_disk=$(df /var | tail -n 1 | awk '{print $4}')
+         free_disk=$(df /shared | tail -n 1 | awk '{print $4}')
          required=$(($(du -s /shared/postgres_data | awk '{print $1}') * 2))
 
          if [ "$free_disk" -lt "$required" ]; then
           echo "WARNING: Upgrading PostgresSQL would require an addtional $(numfmt --to=si $(($required - $free_disk))) of disk space"
           echo "Please free up some space, or expand your disk, before continuing."
+          echo ''
+          echo 'To avoid upgrading change "templates/postgres.template.yml" TO "templates/postgres.9.5.template.yml" in containers/app.yml'
           exit 1
          fi
 
@@ -100,7 +103,7 @@ run:
            echo
            echo When your instance is running:
            echo Run "./launcher enter app"
-           echo Run apt-get remove postgresql-client-9.5 && apt-get instatll postgresql-client-10
+           echo "Run apt-get remove postgresql-client-9.5 && apt-get install postgresql-client-10"
            echo Run "cd /shared/postgres_backup && sudo -u postgres pg_dump discourse > backup.db"
            echo