-
- { media === 'image' &&
}
- { media === 'text' &&
}
- { media === 'video' && contentType === 'video/mp4' &&
}
- { media !== 'image' && media !== 'text' && contentType !== 'video/mp4' &&
}
+
+
+
+ { media === 'image' && }
+ { media === 'text' && }
+ { media === 'video' && contentType === 'video/mp4' && }
+ { media !== 'image' && media !== 'text' && contentType !== 'video/mp4' && }
+
+
{fileExt}
+
+
+
diff --git a/docs/ubuntuinstall.md b/docs/ubuntuinstall.md
index 6a5660c1..9b1d2e0e 100644
--- a/docs/ubuntuinstall.md
+++ b/docs/ubuntuinstall.md
@@ -24,8 +24,6 @@
* Lbrynet DAEMON started on ports 3333 and 4444
* Spee.ch started on port 3000
-_note: throughout this guide you'll be replacing `{{xyz}}` with `yourvalue` omitting the brackets_
-
# 1. Setup OS and install dependencies
## OS
@@ -38,12 +36,11 @@ As root# _create user and add to sudo group_
su - username
```
As username: *paste public key in authorized\_keys*
-
+```
`cd`
-
`mkdir .ssh`
-
`nano ~/.ssh/authorized_keys`
+```
### Prep
@@ -56,9 +53,9 @@ ssh to username@domainname or username@ip_address
```
-## Git, Curl, Unzip, ffmpeg, imagemagick, Node
+## Git, Curl, Tmux, Unzip, ffmpeg, Node
- `sudo apt-get install git curl unzip ffmpeg nodejs imagemagick -y`
+ `sudo apt-get install git curl tmux unzip ffmpeg nodejs imagemagick -y`
## Clone speech either from your own fork, or from the lbryio/spee.ch repo.
@@ -70,7 +67,7 @@ ssh to username@domainname or username@ip_address
`git clone https://github.com/{{youraccount}}/spee.ch.git`
- `git clone git@github.com:{{youraccount}}/spee.ch`
+ `git clone git@github.com:{{youraccount}}/spee.ch`
* For Publishers and Content creators - stable release
@@ -81,23 +78,17 @@ ssh to username@domainname or username@ip_address
`chmod 750 -R ~/spee.ch/docs/setup`
# 2 Secure the UFW firewall
-
## UFW
`sudo ~/spee.ch/docs/setup/scripts/firewall.sh`
- _if your distro isn't vanilla ubuntu 16 or 18, you may have to install it_
-
# 3 Install Caddy to handle https and reverse proxy
-
## Get Caddy
`curl https://getcaddy.com | sudo bash -s personal`
## Set up Caddy reverse proxy and ssl
- _Make Caddy's folders, copy the template, edit the Caddyfile, copy the caddyfile to its folder._
-
```
sudo mkdir -p /opt/caddy/logs/
sudo mkdir -p /opt/caddy/store/
@@ -155,7 +146,7 @@ ssh to username@domainname or username@ip_address
mysql>
- `ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'yourpassword123';`
+ `ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'your_mysql_password';`
mysql>
@@ -181,14 +172,14 @@ ssh to username@domainname or username@ip_address
## Set up lbrynet to run as systemd service
- We'll soon update the setup scripts. Meanwhile, here's an example lbrynet.service file. Again, fully replace {{USERNAME}}
+ We'll soon update the setup scripts. Meanwhile, here's an example lbrynet.service file
```
[Unit]
Description="LBRYnet daemon"
After=network.target
-# Replace {{USERNAME}} with your username, e.g. `bob` or `speechuser`
+# Change environment to /home/{{USERNAME}}
[Service]
Environment="HOME=/home/{{USERNAME}}"
ExecStart=/opt/lbry/lbrynet start
@@ -217,26 +208,21 @@ Finally do the following.
You'll find your lbrynet logs in ~/.local/share/lbry/lbrynet/lbrynet.log
-Let's make our lives easier and link /opt/lbry/lbrynet in /usr/local/bin
-
- `sudo ln -s /opt/lbry/lbrynet /usr/local/bin/lbrynet`
-
-Now we can `lbrynet` without `/opt/lbry`. Let's make sure we're back in our home directory. `cd`
+Now let's make sure we're back in our home directory. `cd`
## Customize SDK settings
These settings will prevent you and your users from spending your server's LBC on paid content. Full documentation is [here](https://lbry.tech/resources/daemon-settings).
~$
+ `mkdir .lbrynet`
- `cd ~/.local/share/lbry/lbrynet`
+ `cd .lbrynet`
`nano daemon_settings.yml`
copy and paste in the following code (Ctrl+Shift V)
- _upnp is unnecessary for a vps but may be useful behind a properly configured NAT_
-
```
run_reflector_server: false
max_key_fee: {amount: 0, currency: LBC}
@@ -245,18 +231,15 @@ Now we can `lbrynet` without `/opt/lbry`. Let's make sure we're back in our home
```
`CONTROL+O` then `CONTROL+X` to save and exit
-
- Restart lbrynet sdk:
-
- `sudo systemctl restart lbrynet`
-
- `sudo systemctl status lbrynet`
-
## Display wallet address to which to send 5+ LBC.
_note: These commands work when `lbrynet` is already running_
+ Let's make our lives easier and link /opt/lbry/lbrynet in /usr/local/bin
+
+ `sudo ln -s /opt/lbry/lbrynet /usr/local/bin/lbrynet`
+
`lbrynet commands` to check out the current commands
`lbrynet address list` to get your wallet address
@@ -270,7 +253,6 @@ Now we can `lbrynet` without `/opt/lbry`. Let's make sure we're back in our home
# 6 Set up spee.ch
## Build it
-
`cd spee.ch`
~/spee.ch:
@@ -291,8 +273,7 @@ Now we can `lbrynet` without `/opt/lbry`. Let's make sure we're back in our home
* Port: 3000
* Site Title: Your Site Name
* Enter your site's domain name: https://example.com or http://localhost:3000
- * Enter a directory where uploads should be stored: (/home/{{username}}/Uploads) *
- _* if you're not sure, `pwd`_
+ * Enter a directory where uploads should be stored: (/home/lbry/Uploads)
`npm run build` (or `npm run dev` to build for developing)
@@ -305,34 +286,15 @@ Now we can `lbrynet` without `/opt/lbry`. Let's make sure we're back in our home
# 7 Production
## pm2 to keep your speech app running
-
-If your server is running in the terminal from the last section, `Control+C` it.
-
- `sudo npm install -g pm2` _There are tutorials online for avoiding sudo for npm i -g_
-
- `cd spee.ch`
-
- `pm2 start npm --name speech -- run start`
-
- While pm2 installed this way will restart the server, it will not rebuild it on changes. You'll do that manually as discussed before.
+ ```
+ npm install -g pm2
+ ```
### 7 Maintenance Procedures
-#### Update sdk daemon
-
- * Backup wallet (private keys!) to a safe place. It should be in ~/.local/share/lbry/lbryum/wallets.
- * `lbrynet stop`
- * Following the instructions in 5: Get the SDK will rename the old daemon and give you the new one.
- * `lbrynet start`
- * `lbrynet version`
- * `lbrynet account balance`
-
-#### Update speech
-
- * Read the release notes to see if there are any breaking changes, address them
- * `pm2 stop speech`
- * `git pull origin release` (assuming you cloned release)
- * `npm i` if necessary
- * `npm run build`
- * `pm2 start speech`
- * Have an exotic energy drink
+#### Change daemon
+ * backup wallet (private keys!) to a safe place
+ * wget daemon from https://github.com/lbryio/lbry/releases
+ * wget -O ~/your_name_daemon.zip https://your_copied_file_path.zip
+ * rm ./lbrynet
+ * unzip -o -u ~/your_name_daemon.zip