Merge branch 'master' into merge-master-0.33.x

.circleci/config.yml

@@ -205,6 +205,19 @@ jobs:
           command: ./node_modules/.bin/yamllint `find resources -name '*.yaml'`
           no_output_timeout: 2m
 
+  verify-i18n-files:
+    executor: node
+    steps:
+      - attach-workspace
+      - restore-fe-deps-cache
+      - run:
+          name: Install gettext
+          command: sudo apt-get install gettext
+      - run:
+          name: Verify i18n .po files
+          command: ./bin/i18n/build-translation-resources
+          no_output_timeout: 2m
+
 
 ########################################################################################################################
 #                                                       BACKEND                                                        #
@@ -467,6 +480,11 @@ workflows:
           requires:
             - checkout
 
+      - verify-i18n-files:
+          requires:
+            - checkout
+            - fe-deps
+
       - be-deps:
           requires:
             - checkout
@@ -660,6 +678,7 @@ workflows:
       - deploy-master:
           requires:
             - yaml-linter
+            - verify-i18n-files
 
             - be-linter-bikeshed
             - be-linter-docstring-checker

.github/ISSUE_TEMPLATE.md

-------
-Before filing an issue we'd appreciate it if you could take a moment to ensure
-there isn't already an open issue or pull-request.
------
 
-If there's an existing issue, please add a :+1: reaction to the description of
-the issue. One way we prioritize issues is by the number of :+1: reactions on
-their descriptions. Please DO NOT add `+1` or :+1: comments.
+Please use the issue chooser, when creating a new issue:
 
-### Security Disclosure
-
-Security is very important to us. If discover any issue regarding security, please disclose the information responsibly by sending an email to security@metabase.com and not by creating a GitHub issue.
-
-### Database support
-
-For requests for new database drivers, please include the name
-of the database and the version. Additionally, giving us a sense of how and what
-you use it for, and other high-level details about the database, can help us get
-a better picture of what would need to done to support it.
-
-### Feature requests and proposals
-We're excited to hear how we can make Metabase better. Please add as much detail
-as you can on your use case.
-
-### Bugs
-If you're filing an issue about a bug please include as much information
-as you can including the following.
-
-- Your browser and the version: (e.x. Chrome 52.1, Firefox 48.0, IE 10)
-- Your operating system: (e.x. OS X 10, Windows XP, etc)
-- Your databases: (e.x. MySQL, Postgres, MongoDB, …)
-- Metabase version: (e.x. 0.19.3)
-- Metabase hosting environment: (e.x. Mac app, Elastic Beanstalk, Docker, Heroku, Linux/Ubuntu 12)
-- Metabase internal database: (e.x. H2 (default), MySQL, Postgres)
-
-- *Repeatable steps to reproduce the issue*
-
-Thanks for being part of the Metabase project!
--------
+https://github.com/metabase/metabase/issues/new/choose

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **Logs**
-Please include javascript console and server logs around the time this bug occured. For information about how to get these, consult our [bug troubleshooting guide](https://metabase.com/docs/latest/troubleshooting-guide/bugs.html)
+Please include javascript console and server logs around the time this bug occurred. For information about how to get these, consult our [bug troubleshooting guide](https://metabase.com/docs/latest/troubleshooting-guide/bugs.html)
 
 **To Reproduce**
 Steps to reproduce the behavior:
@@ -27,22 +27,16 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Information about your Metabase Installation:**
-- Your browser and the version: (e.x. Chrome 52.1, Firefox 48.0, IE 10)
-
-- Your operating system: (e.x. OS X 10, Windows XP, etc)
-
+- Your browser and the version: (e.x. Chrome 52.1, Firefox 48.0, Safari 11.1, …)
+- Your operating system: (e.x. OS X 10.10, Windows 10.1809, Ubuntu 16.04, …)
 - Your databases: (e.x. MySQL, Postgres, MongoDB, …)
-
 - Metabase version: (e.x. 0.19.3)
-
-- Metabase hosting environment: (e.x. Mac app, Elastic Beanstalk, Docker, Heroku, Linux/Ubuntu 12)
-
-- Metabase internal database: (e.x. H2 (default), MySQL, Postgres)
+- Metabase hosting environment: (e.x. Mac app, Elastic Beanstalk, Docker, Heroku, Jar-file on Ubuntu, …)
+- Metabase internal database: (e.x. H2 (default), Postgres or MySQL)
 
 **Severity**
 How severe an issue is this bug to you? Is this annoying, blocking some users, blocking an upgrade or blocking your usage of Metabase entirely?
-
-Note: the more honest and specific you are here the more we will take you seriously. 
+Note: the more honest and specific you are here the more we will take you seriously.
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/questions-and-help.md

@@ -7,6 +7,9 @@ assignees: ''
 
 ---
 
-This issue tracker is intended to collect bug reports and feature requests.
+For help with installation and setup, information on how specific features work, or general questions about Metabase, please use our discussion forum:
 
-For help with installation, information on how features work, or questions about specific features of Metabase, please create a thread on our [discussion forum](https://discourse.metabase.com). Any issues open for help requests will be closed to keep from clogging up the issue tracker.
+https://discourse.metabase.com
+
+The Github issue tracker is intended to collect bug reports and feature requests.
+Any issues open for help requests will be closed to keep from clogging up the issue tracker.

bin/aws-eb-docker/.ebextensions/metabase_config/metabase-setup.sh

@@ -67,6 +67,11 @@ server {
         proxy_set_header    Host                $host;
         proxy_set_header    X-Real-IP            $remote_addr;
         proxy_set_header    X-Forwarded-For        $proxy_add_x_forwarded_for;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
+
     }
 
 
@@ -83,6 +88,10 @@ server {
         proxy_set_header    Host                $host;
         proxy_set_header    X-Real-IP            $remote_addr;
         proxy_set_header    X-Forwarded-For        $proxy_add_x_forwarded_for;
+        proxy_connect_timeout 600;
+        proxy_send_timeout 600;
+        proxy_read_timeout 600;
+        send_timeout 600;
     }
 }
 EOF

bin/version

 #!/usr/bin/env bash
 
-VERSION="v0.33.0"
+VERSION="v0.34.0-snapshot"
 
 # dynamically pull more interesting stuff from latest git commit
 HASH=$(git show-ref --head --hash=7 head)            # first 7 letters of hash should be enough; that's what GitHub uses

docs/administration-guide/01-managing-databases.md

@@ -53,6 +53,10 @@ To add a database, you'll need its connection information.
    - Database Name - Find this under "Configuration Details"
    - Password - Ask your database administrator for the password.
 
+#### Errors When Connecting
+
+If you're experiencing errors when connecting to your database, check our [troubleshooting guide](../troubleshooting-guide/datawarehouse.md) for help.
+
 ### Secure Socket Layer (SSL)
 
 Metabase automatically tries to connect to databases with and without SSL. If it is possible to connect to your database with a SSL connection, Metabase will make that the default setting for your database. You can always change this setting later if you prefer to connect without this layer of security, but we highly recommend keeping SSL turned on to keep your data secure.
@@ -73,9 +77,9 @@ Metabase maintains its own information about the various tables and fields in ea
 
 Syncing can be set to hourly, or daily at a specific time. Syncing can't be turned off completely, otherwise Metabase wouldn't work.
 
-If you'd like to sync your database manually at any time, click on it from the Databases list in the admin panel and click on the Sync button on the right side of the screen:
+If you'd like to sync your database manually at any time, click on it from the Databases list in the admin panel and click on the Sync database schema now button on the right side of the screen:
 
-![Database connection](images/DatabaseConnection.png)
+![Database Manual Sync](images/DatabaseManualSync.png)
 
 #### Query auto-running settings
 
@@ -97,9 +101,7 @@ If for some reason you need to flush out the cached field values for your databa
 
 ##### Re-scanning a single table or field
 
-To re-scan a specific table, go to the Data Model section of the Admin Panel, select the table from the list, and click the gear icon in the top right of the page. Similarly, to do this for just a specific field, on the same Data Model page, find the field you want and click the gear icon on the far right of the field's name and options:
-
-![Field options][images/field-options.png]
+To re-scan a specific table, go to the Data Model section of the Admin Panel, select the table from the list, and click the gear icon in the top right of the page. Similarly, to do this for just a specific field, on the same Data Model page, find the field you want and click the gear icon on the far right of the field's name and options.
 
 On either the table settings or field settings page, you'll see these options:
 
@@ -109,7 +111,7 @@ On either the table settings or field settings page, you'll see these options:
 
 To delete a database from Metabase, click on **Remove this database** from the database detail screen.
 
-![databaseconnection](images/DatabaseConnection.png)
+![Database Manual Sync](images/DatabaseManualSync.png)
 
 You can also delete a database from the database list: hover over the row with the database you want to remove and click the **Delete** button that appears.
 

docs/administration-guide/04-managing-users.md

@@ -24,7 +24,9 @@ To reactivate a deactivated user, click on the Deactivated tab at the top of the
 You can edit a user’s name and email address by clicking the three dots icon and choosing **Edit Details**. Note: be careful when changing a user’s email address, because *this will change the address they’ll use to log in to Metabase*.
 
 ### Resetting a user’s password
-A user can always reset their password using the forgot password link on the login screen, but if you want to do this for them, just click the three dots icon and choose Reset Password. If you haven’t configured your email settings yet, you’ll be given a temporary password that you’ll have to share with that user. Otherwise, they’ll receive a password reset email.
+If you've already [configured your email settings](02-setting-up-email.md), a user can reset their password using the forgot password link on the login screen. If you have not yet configured your email settings, they will see a message telling them to ask an admin to reset their password for them. 
+
+To reset a password for a user, just click the three dots icon and choose Reset Password. If you haven’t [configured your email settings](02-setting-up-email.md) yet, you’ll be given a temporary password that you’ll have to share with that user. Otherwise, they’ll receive a password reset email.
 
 ### Changing a user’s role
 Right now, the only special role a user can have is Admin. The only difference is that Admins can access the Admin Panel and make changes there, and can set [permissions on collections](06-collections.md).

docs/enterprise-guide/audit.md

+## Audit Logs
+
+As an administrator of Metabase, you already know the importance of using data to understand your users. With the Audit tool, you can use Metabase to understand your Metabase user's usage. It's, well, meta! 
+
+Access the tool by clicking the gear icon in the upper right and then clicking Audit in the top navigation. There's a lot of data available, not only about your people, but also about your questions, dashboard, databases and more! We'll walk you through each of the sections below.
+
+### People
+
+Use the People section to gain a better understanding of how your end-users are interacting with Metabase. You'll want to pay attention to the Overview Tab, especially when you first launch Metabase at your organization - it will give you data around how many active and newly created users you have each day. Further down the page, you'll see charts showing you which of your users are most engaged. Use these charts to find your power users!
+
+![Team Members](/images/audit-team.png)
+
+The Team members panel has a view other options for viewing your team's usage data. The All members tab will give you a list of your team members, and stats about their activity, such as when they were last active.
+
+The Audit log tab will display, in chronological order, each query, who viewed it, and when. Note that if the user did not save their query, the Name will be listed as Ad-hoc. Each query name can be clicked to view more details about your user's interactions with it, including a full revision history. You will also be able to view the query in Metabase. Note that this link will always show the latest version of the query - use the revision history to see changes over time.
+
+
+#### Drilling In
+
+Throughout the People section, names can be clicked to access the profile of a specific user’s activity. This profile includes:
+
+* Dashboard views
+* Query views
+* Downloads
+
+![Team Members](/images/audit-teammember.png)
+
+### Data
+
+The Data section focuses on your databases, schemas and tables, and is divided into corresponding sections. Look here if you're trying to uncover queries and schemas that need optimization.  Each section provides visualizations around the use and speed of querying against your databases, schemas or tables. You will also be able to view lists of stats about all of your databases, schemas and tables.
+
+![Data](/images/audit-data.png)
+
+### Items
+The Items section focuses on questions, dashboards and downloads, and is divided into corresponding sections. Use these pages to gain a better understanding of what your users are interacting with.
+
+#### Questions
+
+The Questions section will show you your most popular queries, as well as your slowest queries. If queries you think are important aren't appearing on your most popular queries list, you may want to make sure your team is focusing on the right things. 
+
+If important queries are appearing on the list of slowest queries, you will want to look at optimizing them. One option is to adjust your [caching settings](../../14-caching.html), but there are plenty of other options as well. To help you determine if your optimization efforts are heading in the right direction, use the Query views and speed per day visualization at the bottom of the page.
+
+![Items](/images/audit-questions.png)
+
+A list of all of your questions is available as well, and you can see various data points about each question at a glance, such as number of views and cache TTL.
+
+#### Drilling In
+
+You can also click on any question to drill into a more detailed profile showing:
+
+* View activity
+* Revision History
+* A full audit log of who viewed the question, and when
+
+#### Dashboards
+
+The Dashboards section is another great way to understand what your users who are dashboard-focused are looking at, and to make sure they're having a smooth experience. If you notice that a popular dashboard has a high average question loading time, you can investigate further using the Questions section outlined above.
+
+![Items](/images/audit-dashboards.png)
+
+A list of all of your dashboards is available as well, and you can see various data points about each dashboard at a glance, such as number of views and average question execution time.
+
+#### Downloads
+
+Use the Downloads section to understand which of your users are downloading (or exporting data) and the size (number of rows) of the downloads they're performing. This section contains some visualizations, as well as a list of all of all downloads.
\ No newline at end of file

docs/enterprise-guide/start.md

@@ -10,3 +10,4 @@ The Enterprise Edition of Metabase provides added functionality and solutions fo
 * [Customizing how Metabase looks with white labeling](whitelabeling.md)
 * [Customizing drill-through for charts and tables](customizing-drill-through.md)
 * [Copying contents of one Metabase instance to another (serialization)](serialization.md)
+* [Using the audit logs](audit.md)

docs/faq.md

@@ -54,7 +54,7 @@ To manually fix field or table names if they still look wrong, you can go to the
 
 ### Can I add headings, free text, section dividers, or images to my dashboards?
 
-Yes, by using [text cards](users-guide/07-dashboards.html#adding-headings-or-descriptions-with-text-cards).
+Yes, by using [text cards](users-guide/07-dashboards.md#adding-headings-or-descriptions-with-text-cards).
 
 ### Why do my cards fade out when I use dashboard filters?
 

docs/faq/start.md

@@ -4,25 +4,26 @@ Here is a list of some frequently asked questions about Metabase.
 
 ## General Questions
 
-* [How do I ask for help?](general/how-do-i-ask-for-help.md)
-* [What if I find a bug?](general/what-if-i-find-a-bug.md)
-* [Can I request a new feature?](general/can-i-request-a-new-feature.md)
-* [Does Metabase do X?](general/does-metabase-do-x.md)
-* [Does Metabase have access to my data?](general/does-metabase-have-access-to-my-companys-data.md)
-* [Do we need a Data Processing Agreement with Metabase to comply with GDPR?](general/do-we-need-a-data-processing-agreement.md)
+- [How do I ask for help?](general/how-do-i-ask-for-help.md)
+- [What if I find a bug?](general/what-if-i-find-a-bug.md)
+- [Can I request a new feature?](general/can-i-request-a-new-feature.md)
+- [Does Metabase do X?](general/does-metabase-do-x.md)
+- [Does Metabase have access to my data?](general/does-metabase-have-access-to-my-companys-data.md)
+- [Do we need a Data Processing Agreement with Metabase to comply with GDPR?](general/do-we-need-a-data-processing-agreement.md)
 
 ## Set-up and Admin Questions
 
-* [Which databases does Metabase support?](setup/which-databases-does-metabase-support.md)
-* [I'm having trouble running Metabase.](setup/i-am-having-trouble-running-metabase.md)
-* [What's H2?](setup/what-is-h2.md)
-* [When should I migrate H2 to MySQL or Postgres?](setup/when-should-i-migrate-h2.md)
-* [How do I integrate Metabase and our single-sign on (SSO) solution?](setup/how-do-i-integrate-with-sso.md)
+- [Which databases does Metabase support?](setup/which-databases-does-metabase-support.md)
+- [I'm having trouble running Metabase.](setup/i-am-having-trouble-running-metabase.md)
+- [What's H2?](setup/what-is-h2.md)
+- [When should I migrate H2 to MySQL or Postgres?](setup/when-should-i-migrate-h2.md)
+- [How do I integrate Metabase and our single-sign on (SSO) solution?](setup/how-do-i-integrate-with-sso.md)
 
 ## Using Metabase
 
-* [How do I ask questions about my data?](using-metabase/how-do-i-ask-questions.md)
-* [I'm not getting the email notifications I expect to!](using-metabase/i-am-not-getting-email-notifications.md)
-* [How do I answer questions about data that lives in multiple databases?](using-metabase/how-do-i-answer-questions-when-data-is-in-multiple-databases.md)
-* [How do I answer questions where I need to join tables together?](using-metabase/how-do-i-answer-questions-with-joins.md)
-* [I’m trying to ask a question, but it looks like I can’t access some of the data I need.](using-metabase/cant-access-data-i-need.md)
+- [How do I reset my password?](using-metabase/how-do-i-reset-my-password.md)
+- [How do I ask questions about my data?](using-metabase/how-do-i-ask-questions.md)
+- [I'm not getting the email notifications I expect to!](using-metabase/i-am-not-getting-email-notifications.md)
+- [How do I answer questions about data that lives in multiple databases?](using-metabase/how-do-i-answer-questions-when-data-is-in-multiple-databases.md)
+- [How do I answer questions where I need to join tables together?](using-metabase/how-do-i-answer-questions-with-joins.md)
+- [I’m trying to ask a question, but it looks like I can’t access some of the data I need.](using-metabase/cant-access-data-i-need.md)

docs/faq/using-metabase/how-do-i-reset-my-password.md

+# How do I reset my password?
+
+If you're having trouble logging in due to a forgotten password, click the `I seem to have forgotten my password` button in the lower right of the log-in screen. If your Metabase administrator has already [configured your email settings](02-setting-up-email.md), you will be able to generate a Reset Password email. If email has not been configured, you will need to contact them to perform a password reset.
\ No newline at end of file

docs/operations-guide/running-metabase-on-debian.md

@@ -13,105 +13,65 @@ The core assumption in this guide:
 * You will use environment variables to configure your Metabase instance
 * You have `sudo` access on your server
 
-### Create a Metabase Service
-
-Every service needs a script that tells `systemd` how to manage it, and what capabilities it supports. Services are typically registered at `etc/init.d/<service-name>`. So, a Metabase service should live at `/etc/init.d/metabase`.
+### Create an unprivileged user to run Metabase and give him acces to app and logs
 
-#### The Metabase service file
+For security reasons we want to have Metabase run as an unprivileged user. We will call the user simply `metabase`. Further we will create the files we will need later for logging and configuration of Metabase, and apply the correct security settings for our unprivileged user.
 
-Create the `/etc/init.d/metabase` service file and open it in your editor:
-
-    $ sudo touch /etc/init.d/metabase
-    $ sudo <your-editor> /etc/init.d/metabase
-
-In `/etc/init.d/metabase`, replace configurable items (they look like `<some-var-name>`) with values sensible for your system. The Metabase script below has extra comments to help you know what everything is for.
-
-
-    #!/bin/sh
-    # /etc/init.d/metabase
-    ### BEGIN INIT INFO
-    # Provides:          Metabase
-    # Required-Start:    $local_fs $network $named $time $syslog
-    # Required-Stop:     $local_fs $network $named $time $syslog
-    # Default-Start:     2 3 4 5
-    # Default-Stop:      0 1 6
-    # Description:       Metabase analytics and intelligence platform
-    ### END INIT INFO
-
-    # where is the Metabase jar located?
-    METABASE=</your/path/to/>metabase.jar
-
-    # where will our environment variables be stored?
-    METABASE_CONFIG=/etc/default/metabase
-
-    # which (unprivileged) user should we run Metabase as?
-    RUNAS=<your_deploy_user>
-
-    # where should we store the pid/log files?
-    PIDFILE=/var/run/metabase.pid
-    LOGFILE=/var/log/metabase.log
-
-    start() {
-      # ensure we only run 1 Metabase instance
-      if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
-        echo 'Metabase already running' >&2
-        return 1
-      fi
-      echo 'Starting Metabase...' >&2
-      # execute the Metabase jar and send output to our log
-      local CMD="nohup java -jar \"$METABASE\" &> \"$LOGFILE\" & echo \$!"
-      # load Metabase config before we start so our env vars are available
-      . "$METABASE_CONFIG"
-      # run our Metabase cmd as unprivileged user
-      su -c "$CMD" $RUNAS > "$PIDFILE"
-      echo 'Metabase started.' >&2
-    }
+    $ sudo groupadd -r metabase
+    $ sudo useradd -r -s /bin/false -g metabase metabase
+    $ sudo chown -R metabase:metabase </your/path/to/metabase/directory>
+    $ sudo touch /var/log/metabase.log
+    $ sudo chown metabase:metabase /var/log/metabase.log
+    $ sudo touch /etc/default/metabase
+    $ sudo chmod 640 /etc/default/metabase
 
-    stop() {
-      # ensure Metabase is running
-      if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
-        echo 'Metabase not running' >&2
-        return 1
-      fi
-      echo 'Stopping Metabase ...' >&2
-      # send Metabase TERM signal
-      kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
-      echo 'Metabase stopped.' >&2
-    }
+### Create a Metabase Service
 
-    uninstall() {
-      echo -n "Are you really sure you want to uninstall Metabase? That cannot be undone. [yes|No] "
-      local SURE
-      read SURE
-      if [ "$SURE" = "yes" ]; then
-        stop
-        rm -f "$PIDFILE"
-        rm -f "$METABASE_CONFIG"
-        # keep logfile around
-        echo "Notice: log file is not be removed: '$LOGFILE'" >&2
-        update-rc.d -f metabase remove
-        rm -fv "$0"
-      fi
-    }
+Every service needs a script that tells `systemd` how to manage it, and what capabilities it supports. Services are typically registered at `/etc/systemd/system/<servicename>`. So, a Metabase service should live at `/etc/systemd/system/metabase.service`.
 
-    case "$1" in
-      start)
-        start
-        ;;
-      stop)
-        stop
-        ;;
-      uninstall)
-        uninstall
-        ;;
-      restart)
-        stop
-        start
-        ;;
-      *)
-        echo "Usage: $0 {start|stop|restart|uninstall}"
-    esac
+#### The Metabase service file
 
+Create the `/etc/systemd/system/metabase.service` service file and open it in your editor:
+
+    $ sudo touch /etc/systemd/system/metabase.service
+    $ sudo <your-editor> /etc/systemd/system/metabase.service
+
+In `/etc/systemd/system/metabase.service`, replace configurable items (they look like `<some-var-name>`) with values sensible for your system. The Metabase script below has extra comments to help you know what everything is for.
+
+    [Unit]
+    Description=Metabase server
+    After=syslog.target
+    After=network.target
+   
+    [Service]
+    WorkingDirectory=</your/path/to/metabase/directory/>
+    ExecStart=/usr/bin/java -jar </your/path/to/metabase/directory/>metabase.jar
+    EnvironmentFile=/etc/default/metabase
+    User=metabase
+    Type=simple
+    StandardOutput=syslog
+    StandardError=syslog
+    SyslogIdentifier=metabase
+    SuccessExitStatus=143
+    TimeoutStopSec=120
+    Restart=always
+   
+    [Install]
+    WantedBy=multi-user.target
+    
+### Create syslog conf
+
+Next we need to create a syslog conf to make sure systemd is able to handle the logs properly.
+
+    $ sudo touch /etc/rsyslog.d/metabase.conf
+    $ sudo <your-editor> /etc/rsyslog.d/metabase.conf
+    
+    if $programname == 'metabase' then /var/log/metabase.log
+    & stop
+    
+Restart the syslog service to load the new config.
+
+    $ sudo systemctl restart rsyslog.service
 
 ### Environment Variables for Metabase
 
@@ -119,27 +79,24 @@ Environment variables provide a good way to customize and configure your Metabas
 
 #### The Metabase config file
 
-Create your `/etc/default/metabase` environment config file and open it in your editor:
+Open your `/etc/default/metabase` environment config file in your editor:
 
-    $ sudo touch /etc/default/metabase
     $ sudo <your-editor> /etc/default/metabase
 
 In `/etc/default/metabase`, replace configurable items (they look like `<some-var-name>`) with values sensible for your system. Some Metabase configs have available options, some of which are shown below, separated by `|` symbols:
 
 
-    #!/bin/sh
-    # /etc/default/metabase
-    export MB_PASSWORD_COMPLEXITY=<weak|normal|strong>
-    export MB_PASSWORD_LENGTH=<10>
-    export MB_JETTY_HOST=<0.0.0.0>
-    export MB_JETTY_PORT=<12345>
-    export MB_DB_TYPE=<postgres|mysql|h2>
-    export MB_DB_DBNAME=<your_metabase_db_name>
-    export MB_DB_PORT=<5432>
-    export MB_DB_USER=<your_metabase_db_user>
-    export MB_DB_PASS=<ssshhhh>
-    export MB_DB_HOST=<localhost>
-    export MB_EMOJI_IN_LOGS=<true|false>
+    MB_PASSWORD_COMPLEXITY=<weak|normal|strong>
+    MB_PASSWORD_LENGTH=<10>
+    MB_JETTY_HOST=<0.0.0.0>
+    MB_JETTY_PORT=<12345>
+    MB_DB_TYPE=<postgres|mysql|h2>
+    MB_DB_DBNAME=<your_metabase_db_name>
+    MB_DB_PORT=<5432>
+    MB_DB_USER=<your_metabase_db_user>
+    MB_DB_PASS=<ssshhhh>
+    MB_DB_HOST=<localhost>
+    MB_EMOJI_IN_LOGS=<true|false>
     # any other env vars you want available to Metabase
 
 ### Final Steps
@@ -171,23 +128,20 @@ Getting into too much detail about configuring `nginx` is well outside the scope
 
 Now, it's time to register our Metabase service with `systemd` so it will start up at system boot. We'll also ensure our log file is created and owned by the unprivileged user our service runs the `metabase.jar` as.
 
-    # ensure our metabase script is executable
-    $ sudo chmod +x /etc/init.d/metabase
+    $ sudo systemctl daemon-reload
+    $ sudo systemctl start metabase.service
+    $ sudo systemctl status metabase.service
 
-    # create the log file we declared in /etc/init.d/metabase
-    $ sudo touch /var/log/metabase.log
+Once we are ok here, enable the service to startup during boot.
 
-    # ensure unprivileged deploy user owns log (or it won't be able to write)
-    $ sudo chown <your_deploy_user>:<your_deploy_user> /var/log/metabase.log
+    $ sudo systemctl enable metabase.service
 
-    # add to default services
-    $ sudo update-rc.d metabase defaults
 
 #### That's it!
 
 Now, whenever you need to start, stop, or restart Metabase, all you need to do is:
 
-    $ sudo service metabase start
-    $ sudo service metabase stop
-    $ sudo service metabase restart
+    $ sudo systemctl start metabase.service
+    $ sudo systemctl stop metabase.service
+    $ sudo systemctl restart metabase.service