diff --git a/knexfile.js b/knexfile.js index 77e0454c..12f5362d 100644 --- a/knexfile.js +++ b/knexfile.js @@ -20,7 +20,7 @@ if (process.env.NODE_ENV === 'production') { } // https://github.com/tgriesser/knex/issues/852 -if (!(!process.env.PGSSLMODE || process.env.PGSSLMODE === 'disabled')) { +if (process.env.PGSSLMODE || process.env.PGSSLMODE !== 'disable') { connection.ssl = { rejectUnauthorized: false, ca: fs.readFileSync(process.env.PGSSLROOTCERT).toString(), diff --git a/package.json b/package.json index 7e877f0a..1631573c 100644 --- a/package.json +++ b/package.json @@ -115,6 +115,7 @@ "db-migrate": "knex migrate:latest", "db-rollback": "knex migrate:rollback", "db-seed": "knex seed:run", + "db-version": "knex migrate:currentVersion", "deploy": "yarn install && yarn relay && yarn build && firebase deploy" } } diff --git a/src/common/LoginButton.js b/src/common/LoginButton.js index 577ad454..ff6a8248 100644 --- a/src/common/LoginButton.js +++ b/src/common/LoginButton.js @@ -6,10 +6,10 @@ /* @flow */ +import cx from 'classnames'; import React from 'react'; import PropTypes from 'prop-types'; import Button from '@material-ui/core/Button'; -import cx from 'classnames'; import { darken } from '@material-ui/core/styles/colorManipulator'; import { withStyles } from '@material-ui/core/styles'; diff --git a/src/server/db/index.js b/src/server/db/index.js index 36c1306f..546b845c 100644 --- a/src/server/db/index.js +++ b/src/server/db/index.js @@ -18,7 +18,7 @@ if (process.env.NODE_ENV === 'production') { } // https://github.com/tgriesser/knex/issues/852 -if (!(!process.env.PGSSLMODE || process.env.PGSSLMODE === 'disabled')) { +if (process.env.PGSSLMODE && process.env.PGSSLMODE !== 'disable') { connection.ssl = { rejectUnauthorized: false, ca: fs.readFileSync(process.env.PGSSLROOTCERT).toString(),