Merge branch 'dev' into federation

5 files changed, 16 insertions, 17 deletions

diff --git a/docker/dev/deploy.sh b/docker/dev/deploy.sh
index db2294fa..09b21b0b 100755
--- a/docker/dev/deploy.sh
+++ b/docker/dev/deploy.sh
@@ -72,5 +72,5 @@ git push origin $new_tag
 git push
 
 # Pushing to any ansible deploys
-cd ../../ansible || exit
-ansible-playbook lemmy.yml --become
+cd ../../../lemmy-ansible || exit
+ansible-playbook -i prod playbooks/site.yml --vault-password-file vault_pass
diff --git a/docker/dev/dev_deploy.sh b/docker/dev/dev_deploy.sh
deleted file mode 100755
index ef41434b..00000000
--- a/docker/dev/dev_deploy.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Building from the dev branch for dev servers
-git checkout dev
-
-# Rebuilding dev docker
-docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:dev
-docker push dessalines/lemmy:dev
-
-# SSH and pull it
-ssh $LEMMY_USER@$LEMMY_HOST "cd ~/git/lemmy/docker/dev && docker pull dessalines/lemmy:dev && docker-compose up -d"
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index a7d289b2..3c52d1e5 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     environment:
       - RUST_LOG=debug
     volumes:
-      - ../lemmy.hjson:/config/config.hjson:ro
+      - ../lemmy.hjson:/config/config.hjson
     depends_on: 
       - postgres
       - pictshare
diff --git a/docker/dev/test_deploy.sh b/docker/dev/test_deploy.sh
new file mode 100755
index 00000000..1ae91f65
--- /dev/null
+++ b/docker/dev/test_deploy.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Rebuilding dev docker
+docker-compose build
+docker tag dev_lemmy:latest dessalines/lemmy:test
+docker push dessalines/lemmy:test
+
+# Run the playbook
+pushd ../../../lemmy-ansible
+ansible-playbook -i test playbooks/site.yml --vault-password-file vault_pass
+popd
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 76f5ae14..90551465 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -12,14 +12,14 @@ services:
     restart: always
 
   lemmy:
-    image: dessalines/lemmy:v0.6.44
+    image: dessalines/lemmy:v0.6.49
     ports:
       - "127.0.0.1:8536:8536"
     restart: always
     environment:
       - RUST_LOG=error
     volumes:
-      - ./lemmy.hjson:/config/config.hjson:ro
+      - ./lemmy.hjson:/config/config.hjson
     depends_on:
       - postgres
       - pictshare