From: Dessalines <tyhou13@gmx.com>
Date: Tue, 14 Jan 2020 22:14:06 +0000 (-0500)
Subject: Merge branch 'dev'
X-Git-Url: http://these/git/?a=commitdiff_plain;h=d02eb031bacdb1b43051b782464942ddc57f3f28;hp=fea6f76f4d415a23780a8cba5c08281f7d0c3707;p=lemmy.git

Merge branch 'dev'
---

diff --git a/.gitignore b/.gitignore
index 16548f36..7fac3d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 ansible/inventory
 ansible/passwords/
 docker/lemmy_mine.hjson
+docker/dev/env_deploy.sh
 build/
 .idea/
diff --git a/docker/dev/dev_deploy.sh b/docker/dev/dev_deploy.sh
index 5bbbff6d..ef41434b 100755
--- a/docker/dev/dev_deploy.sh
+++ b/docker/dev/dev_deploy.sh
@@ -9,4 +9,4 @@ docker tag dev_lemmy:latest dessalines/lemmy:dev
 docker push dessalines/lemmy:dev
 
 # SSH and pull it
-ssh tyler@45.55.175.59 "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"
+ssh $LEMMY_USER@$LEMMY_HOST "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"