Merge pull request #1336 from errbit/chore/fix-heroku-demo

Heroku deploy: add demo data too
errbit · Aug 6, 2018 · 6c1a2dd · 6c1a2dd
2 parents 98bcaec + 3c72409
commit 6c1a2dd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/app.json b/app.json
@@ -10,33 +10,15 @@
       "description": "A secret key for verifying the integrity of signed cookies.",
       "generator": "secret"
     },
+    "HEROKU_APP_NAME": {
+      "description": "Have Heroku export the current app name for review apps, see https://devcenter.heroku.com/articles/github-integration-review-apps#heroku_app_name-and-heroku_parent_app_name",
+      "required": true
+    },
     "EMAIL_DELIVERY_METHOD": "smtp",
     "SMTP_SERVER": "smtp.sendgrid.net"
   },
-  "environments": {
-    "test": {
-      "env": {
-        "ERRBIT_ENFORCE_SSL": "true",
-        "GEMFILE_RUBY_VERSION": "2.3.3",
-        "SECRET_KEY_BASE": {
-          "description": "A secret key for verifying the integrity of signed cookies.",
-          "generator": "secret"
-        },
-        "EMAIL_DELIVERY_METHOD": "smtp",
-        "SMTP_SERVER": "smtp.sendgrid.net",
-        "ERRBIT_ADMIN_EMAIL": {
-          "description": "Set the demo admin login for ease of PR review",
-          "value":"admin@example.com"
-        },
-        "ERRBIT_ADMIN_PASSWORD": {
-          "description": "Set the demo admin password for ease of PR review",
-          "value": "demo-admin"
-        }
-      },
-      "scripts": {
-        "postdeploy": "bundle exec rake errbit:bootstrap"
-      }
-    }
+  "scripts": {
+    "postdeploy": "bundle exec rake errbit:bootstrap errbit:demo"
   },
   "addons": [
     "mongolab:sandbox",

diff --git a/db/seeds.rb b/db/seeds.rb
@@ -5,8 +5,23 @@
 
 # Create an initial Admin User
 admin_username = ENV['ERRBIT_ADMIN_USER'] || "errbit"
-admin_email    = ENV['ERRBIT_ADMIN_EMAIL'] || "errbit@#{Errbit::Config.host}"
-admin_pass     = ENV['ERRBIT_ADMIN_PASSWORD'] || SecureRandom.urlsafe_base64(12)[0, 12]
+
+def admin_email
+  return 'admin@example.com' if heroku_pr_review_app?
+
+  ENV['ERRBIT_ADMIN_EMAIL'] || "errbit@#{Errbit::Config.host}"
+end
+
+def admin_pass
+  return 'demo-admin' if heroku_pr_review_app?
+
+  @admin_pass ||= ENV['ERRBIT_ADMIN_PASSWORD'] || SecureRandom.urlsafe_base64(12)[0, 12]
+end
+
+def heroku_pr_review_app?
+  app_name = ENV.fetch("HEROKU_APP_NAME", "")
+  app_name.include?("errbit-deploy-pr-")
+end
 
 puts "Creating an initial admin user:"
 puts "-- username: #{admin_username}" if Errbit::Config.user_has_username

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -24,7 +24,7 @@ In order of precedence Errbit uses:
 <dd>defaults to false
 <dt>ERRBIT_ADMIN_EMAIL
 <dd>E-Mail address of initial admin user
-<dd>defaults to `errbit@example.com`
+<dd>defaults to `errbit@errbit.example.com`
 <dt>ERRBIT_ADMIN_PASSWORD
 <dd>Password of initial admin user
 <dd>defaults to some random string (see output of `$ rake db:seed`)