diff options
author | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-06-01 16:29:58 +0300 |
commit | 65db5e9f528a3f8d8b3c81953fd160a6744dfffd (patch) | |
tree | 9da5234f8a9dd411b59e839eeb38254822939e2f /docs/installation/openbsd_en.md | |
parent | 300d94c62829d0ec961f3ed6c0242dea102ab0ad (diff) | |
parent | f8d4c02431aa634dc74074b93d1cb522e47056ce (diff) | |
download | pleroma-65db5e9f528a3f8d8b3c81953fd160a6744dfffd.tar.gz |
Resolve merge conflicts
Diffstat (limited to 'docs/installation/openbsd_en.md')
-rw-r--r-- | docs/installation/openbsd_en.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/installation/openbsd_en.md b/docs/installation/openbsd_en.md index 633b08e6c..fcba38b2c 100644 --- a/docs/installation/openbsd_en.md +++ b/docs/installation/openbsd_en.md @@ -29,7 +29,7 @@ This creates a "pleroma" login class and sets higher values than default for dat Create the \_pleroma user, assign it the pleroma login class and create its home directory (/home/\_pleroma/): `useradd -m -L pleroma _pleroma` #### Clone pleroma's directory -Enter a shell as the \_pleroma user. As root, run `su _pleroma -;cd`. Then clone the repository with `git clone https://git.pleroma.social/pleroma/pleroma.git`. Pleroma is now installed in /home/\_pleroma/pleroma/, it will be configured and started at the end of this guide. +Enter a shell as the \_pleroma user. As root, run `su _pleroma -;cd`. Then clone the repository with `git clone -b master https://git.pleroma.social/pleroma/pleroma.git`. Pleroma is now installed in /home/\_pleroma/pleroma/, it will be configured and started at the end of this guide. #### Postgresql Start a shell as the \_postgresql user (as root run `su _postgresql -` then run the `initdb` command to initialize postgresql: |