Merge branch 'dev'

diff --git a/.gitignore b/.gitignore
index 16548f36c615c3cbc33699d769c8edf5b7125c38..7fac3d5fe1febb9b6fa179cf145dbb346c0266a2 100644 (file)
--- 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 5bbbff6d70ac0cedbfb5a339469ecb7fbe254f95..ef41434b37324a053a17422b6368daa11907e293 100755 (executable)
--- 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"