Ensure /shared/log/rails is owned by discourse user

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

diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index f924f1bf00b0d2b5810d2d9e92eeff0052cf7c9b..abed0f4e98d0e2e3c7f65e0f79168158734f5fba 100644 (file)
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -19,10 +19,6 @@ hooks:
           0 */4 * * * /var/lib/postgresql/take-database-backup
 
   before_code:
-    - replace:
-       filename: /etc/service/sidekiq/run
-       from: "# postgres"
-       to: sv start postgres || exit 1
     - replace:
        filename: /etc/service/unicorn/run
        from: "# postgres"
@@ -55,6 +51,7 @@ run:
          echo Upgrading PostgreSQL to from version 9.2 to 9.3
          rm -fr /shared/postgres_data_new
          install -d -m 0755 -o postgres -g postgres /shared/postgres_data_new && sudo -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /shared/postgres_data_new || exit 0
+         apt-get update
          apt-get install -y postgresql-9.2
          /etc/init.d/postgresql stop
          rm -fr /shared/postgres_data/postmaster.pid
@@ -62,7 +59,33 @@ run:
          cp /etc/postgresql/9.2/main/*.conf /shared/postgres_data
          echo  >> /shared/postgres_data/postgresql.conf
          echo "data_directory = '/shared/postgres_data'" >> /shared/postgres_data/postgresql.conf
-         sudo -u postgres /usr/lib/postgresql/9.3/bin/pg_upgrade -d /shared/postgres_data -D /shared/postgres_data_new -b /usr/lib/postgresql/9.2/bin -B /usr/lib/postgresql/9.3/bin || exit 1
+         SUCCESS=true
+         sudo -u postgres /usr/lib/postgresql/9.3/bin/pg_upgrade -d /shared/postgres_data -D /shared/postgres_data_new -b /usr/lib/postgresql/9.2/bin -B /usr/lib/postgresql/9.3/bin || SUCCESS=false
+
+         if [[ "$SUCCESS" == 'false' ]]; then
+           echo -------------------------------------------------------------------------------------
+           echo UPGRADE OF POSTGRES FAILED
+           echo
+           echo You are going to need to export your data and import into a clean instance:
+           echo
+           echo Add the line: 'base_image: "samsaffron/discourse:0.1.1"'
+           echo Change: "templates/postgres.template.yml TO templates/postgres.9.2.template.yml"
+           echo
+           echo Run "./launcher bootstrap" again
+           echo
+           echo When your instance is running:
+           echo - Go to the admin UI, enable readonly and backup your site
+           echo
+           echo Then destroy your container "./launcher destroy standalone"
+           echo Undo the base_image and postgres.9.2 template from your container config
+           echo Run: "sudo mv /var/docker/shared/postgres_data /var/shared/postgres_data_old"
+           echo Run: "./launcher bootstrap"
+           echo
+           echo "Login to the blank site, and import your backup (remember to set the allow_restore site setting)"
+           echo Restart your container: "./launcher restart"
+           echo -------------------------------------------------------------------------------------
+           exit 1
+         fi
 
          mv /shared/postgres_data /shared/postgres_data_old
          mv /shared/postgres_data_new /shared/postgres_data
@@ -79,7 +102,7 @@ run:
   - exec:
       cmd:
         - chown -R root /var/lib/postgresql/9.3/main
-        - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /shared/postgres_data || exit 0"
+        - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -E -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /shared/postgres_data || exit 0"
         - chown -R postgres:postgres /shared/postgres_data
         - chown -R postgres:postgres /var/run/postgresql