From 04916a5f9db011b44c624a6975f4b92e3abfb11c Mon Sep 17 00:00:00 2001 From: thomas9987 Date: Thu, 1 Oct 2015 12:30:47 -0700 Subject: Fixed formatting Removed empty bullet point --- doc/install/prod-ubuntu.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/install/prod-ubuntu.md b/doc/install/prod-ubuntu.md index 866b1bdbe..2c7edcb6b 100644 --- a/doc/install/prod-ubuntu.md +++ b/doc/install/prod-ubuntu.md @@ -90,8 +90,7 @@ exec bin/platform 1. Configure Nginx to proxy connections from the internet to the Mattermost Server * Create a configuration for Mattermost * ``` sudo touch /etc/nginx/sites-available/mattermost``` - * Below is a sample configuration with the minimum settings required to configure Mattermost. - * + * Below is a sample configuration with the minimum settings required to configure Mattermost ``` server { server_name mattermost.example.com; -- cgit v1.2.3-1-g7c22 From 7ecca3bcadc8f911b68749e7317fe01dd6f8e77d Mon Sep 17 00:00:00 2001 From: drbaker Date: Thu, 1 Oct 2015 12:31:10 -0700 Subject: Grammar fix: "setup" -> "set up" in header lines --- doc/install/prod-ubuntu.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/install/prod-ubuntu.md b/doc/install/prod-ubuntu.md index 866b1bdbe..20c4976d7 100644 --- a/doc/install/prod-ubuntu.md +++ b/doc/install/prod-ubuntu.md @@ -6,7 +6,7 @@ * ``` sudo apt-get update``` * ``` sudo apt-get upgrade``` -## Setup Database Server +## Set up Database Server 1. For the purposes of this guide we will assume this server has an IP address of 10.10.10.1 1. Install PostgreSQL 9.3+ (or MySQL 5.2+) * ``` sudo apt-get install postgresql postgresql-contrib``` @@ -25,7 +25,7 @@ 1. You can exit the postgres account by typing: * ``` exit``` -## Setup Mattermost Server +## Set up Mattermost Server 1. For the purposes of this guide we will assume this server has an IP address of 10.10.10.2 1. Download the latest Mattermost Server by typing: * ``` wget https://github.com/mattermost/platform/releases/download/v1.0.0/mattermost.tar.gz``` @@ -70,7 +70,7 @@ exec bin/platform * You should see a page titles *Mattermost - Signup* * You can also stop the process by running the command ` sudo stop mattermost`, but we will skip this step for now. -## Setup Nginx Server +## Set up Nginx Server 1. For the purposes of this guide we will assume this server has an IP address of 10.10.10.3 1. We use Nginx for proxying request to the Mattermost Server. The main benefits are: * SSL termination @@ -118,7 +118,7 @@ exec bin/platform * ``` curl http://localhost``` * You should see a page titles *Mattermost - Signup* -## Setup Nginx with SSL (Recommended) +## Set up Nginx with SSL (Recommended) 1. You will need a SSL cert from a certificate authority. 1. For simplicity we will generate a test certificate. * ``` mkdir ~/cert``` -- cgit v1.2.3-1-g7c22 From 89bed8ddfcb37b3c3d574e432b39b0eb915dd2c9 Mon Sep 17 00:00:00 2001 From: chuck5 Date: Thu, 1 Oct 2015 12:35:42 -0700 Subject: Changed comma to period to correct grammar error. --- doc/install/prod-ubuntu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/install/prod-ubuntu.md b/doc/install/prod-ubuntu.md index 866b1bdbe..8038a43d2 100644 --- a/doc/install/prod-ubuntu.md +++ b/doc/install/prod-ubuntu.md @@ -31,7 +31,7 @@ * ``` wget https://github.com/mattermost/platform/releases/download/v1.0.0/mattermost.tar.gz``` 1. Unzip the Mattermost Server by typing: * ``` tar -xvzf mattermost.tar.gz``` -1. For the sake of making this guide simple we located the files at `/home/ubuntu/mattermost`, in the future we will give guidance for storing under `/opt`. +1. For the sake of making this guide simple we located the files at `/home/ubuntu/mattermost`. In the future we will give guidance for storing under `/opt`. 1. We have also elected to run the Mattermost Server as the `ubuntu` account for simplicity. We recommend settings up and running the service under a `mattermost` user account with limited permissions. 1. Create the storage directory for files. We assume you will have attached a large drive for storage of images and files. For this setup we will assume the directory is located at `/mattermost/data`. * Create the directory by typing: -- cgit v1.2.3-1-g7c22 From ab8685a74d8554aae233a977ea4d9e70d540a43b Mon Sep 17 00:00:00 2001 From: tmuwandi Date: Thu, 1 Oct 2015 12:40:33 -0700 Subject: Update prod-ubuntu.md --- doc/install/prod-ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/install/prod-ubuntu.md b/doc/install/prod-ubuntu.md index 20c4976d7..ea6bd4aa2 100644 --- a/doc/install/prod-ubuntu.md +++ b/doc/install/prod-ubuntu.md @@ -177,9 +177,9 @@ exec bin/platform * Save the Settings 1. Update File Settings * Change *Local Directory Location* from `./data/` to `/mattermost/data` -1. Update Log Settings +1. Update Log Settings. * Set *Log to The Console* to false -1. Update Rate Limit Settings +1. Update Rate Limit Settings. * Set *Vary By Remote Address* to false * Set *Vary By HTTP Header* to X-Real-IP 1. Feel free to modify other settings. -- cgit v1.2.3-1-g7c22 From 36f0117afb3b795d782631205a1ae6b3bcda9f2b Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 2 Oct 2015 05:16:20 -0700 Subject: Create slack-import.md --- doc/import/slack-import.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/import/slack-import.md (limited to 'doc') diff --git a/doc/import/slack-import.md b/doc/import/slack-import.md new file mode 100644 index 000000000..14528e4b9 --- /dev/null +++ b/doc/import/slack-import.md @@ -0,0 +1,15 @@ +#### Slack Import (Preview) + +The Slack Import feature in Mattermost is in "Preview" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option. + +Mattermost currently supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team. + +- In the feature preview, emails and usernames from Slack are used to create new Mattermost accounts, connected to messages history in imported Slack channels. Users can activate these accounts and by going to the Password Reset screen in Mattermost to set new credentials. +- Once logged in, users will have access to previous Slack messages shared in public channels, now imported to Mattermost. + +Limitations: + +- Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI. +- Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. +- The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still show Slack ID). +- Newly added markdown suppport in Slack's Posts 2.0 feature is not yet supported. -- cgit v1.2.3-1-g7c22 From f0c8019da468895a3da89809f63d272eaf26bb59 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 2 Oct 2015 05:16:58 -0700 Subject: Added link to Slack Import --- doc/README.md | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/README.md b/doc/README.md index c339f2279..dc1591705 100644 --- a/doc/README.md +++ b/doc/README.md @@ -28,3 +28,4 @@ ## End User Help - [Mattermost Markdown Formatting](help/enduser/markdown.md) +- [Slack Import](https://github.com/mattermost/platform/blob/master/doc/import/slack-import.md) -- cgit v1.2.3-1-g7c22 From fbbee5bf614c1cbce5a4beb02d553b3261c8d749 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 2 Oct 2015 05:40:34 -0700 Subject: Update slack-import.md --- doc/import/slack-import.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/import/slack-import.md b/doc/import/slack-import.md index 14528e4b9..c30de0567 100644 --- a/doc/import/slack-import.md +++ b/doc/import/slack-import.md @@ -1,5 +1,7 @@ #### Slack Import (Preview) +*Note: As a SaaS service, Slack is able to change its export format quickly. If you encounter issues not mentioned in the documentation below, please let us know by [filing an issue](https://github.com/mattermost/platform/issues).* + The Slack Import feature in Mattermost is in "Preview" and focus is on supporting migration of teams of less than 100 registered users. The feature can be accessed from by Team Administrators and Team Owners via the `Team Settings -> Import` menu option. Mattermost currently supports the processing of an "Export" file from Slack containing account information and public channel archives from a Slack team. @@ -9,7 +11,8 @@ Mattermost currently supports the processing of an "Export" file from Slack cont Limitations: +- Newly added markdown suppport in Slack's Posts 2.0 feature announced on September 28, 2015 is not yet supported. - Slack does not export files or images your team has stored in Slack's database. Mattermost will provide links to the location of your assets in Slack's web UI. - Slack does not export any content from private groups or direct messages that your team has stored in Slack's database. - The Preview release of Slack Import does not offer pre-checks or roll-back and will not import Slack accounts with username or email address collisions with existing Mattermost accounts. Also, Slack channel names with underscores will not import. Also, mentions do not yet resolve as Mattermost usernames (still show Slack ID). -- Newly added markdown suppport in Slack's Posts 2.0 feature is not yet supported. + -- cgit v1.2.3-1-g7c22