aboutsummaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-05-04 16:52:48 -0400
committerbnewbold <bnewbold@robocracy.org>2016-05-04 16:52:48 -0400
commit0de199035d751b63327146ac1db923511f54529d (patch)
treecac3d69e6b605c8bed919612952fc2061df2ba50 /roles
parent182c50ccbf5e835a4985dfeea7c4aa7a6a69ac0c (diff)
downloadinfra-0de199035d751b63327146ac1db923511f54529d.tar.gz
infra-0de199035d751b63327146ac1db923511f54529d.zip
mediagoblin: small fixes; db location; permissions; data path
Diffstat (limited to 'roles')
-rw-r--r--roles/mediagoblin/tasks/mediagoblin.yml6
-rw-r--r--roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j22
-rw-r--r--roles/mediagoblin/templates/mediagoblin_local.ini.j23
3 files changed, 6 insertions, 5 deletions
diff --git a/roles/mediagoblin/tasks/mediagoblin.yml b/roles/mediagoblin/tasks/mediagoblin.yml
index c99b65c..ff092e6 100644
--- a/roles/mediagoblin/tasks/mediagoblin.yml
+++ b/roles/mediagoblin/tasks/mediagoblin.yml
@@ -30,7 +30,7 @@
- name: Create user data directory
file: name={{ mediagoblin_basedir }}/data
state=directory
- mode=0750
+ mode=0755
owner={{ mediagoblin_user }}
- name: Create mediagoblin PID directory
@@ -102,8 +102,8 @@
- name: Have systemd detect new files
shell: systemctl daemon-reload
-- name: Start systemd paster service
- shell: systemctl start mediagoblin-celeryd.service && systemctl start mediagoblin-paster.service
+- name: (Re)start systemd paster service
+ shell: systemctl restart mediagoblin-celeryd.service && systemctl restart mediagoblin-paster.service
- name: Enable systemd services
shell: systemctl enable mediagoblin-celeryd.service && systemctl enable mediagoblin-paster.service
diff --git a/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2 b/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
index 855c580..dad976c 100644
--- a/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
+++ b/roles/mediagoblin/templates/etc_nginx_sites-available_mediagoblin.j2
@@ -23,7 +23,7 @@ server {
# Instance specific media:
location /mgoblin_media/ {
- alias {{ mediagoblin_basedir }}/src/user_dev/media/public/;
+ alias {{ mediagoblin_basedir }}/data/media/public/;
}
# Theme static files (usually symlinked in)
diff --git a/roles/mediagoblin/templates/mediagoblin_local.ini.j2 b/roles/mediagoblin/templates/mediagoblin_local.ini.j2
index 535cb0a..bca94f8 100644
--- a/roles/mediagoblin/templates/mediagoblin_local.ini.j2
+++ b/roles/mediagoblin/templates/mediagoblin_local.ini.j2
@@ -8,7 +8,7 @@
# directory in paste.ini and/or your webserver configuration.
#
# [DEFAULT]
-# data_basedir = "/var/lib/mediagoblin"
+data_basedir = "{{ mediagoblin_basedir }}/data"
[mediagoblin]
direct_remote_path = /mgoblin_static/
@@ -18,6 +18,7 @@ email_sender_address = "{{ mediagoblin_email_sender }}"
## Default is a local sqlite db "mediagoblin.db".
## Don't forget to run `./bin/gmg dbupdate` after having changed it.
# sql_engine = postgresql:///mediagoblin
+sql_engine = "sqlite:///{{ mediagoblin_basedir }}/data/mediagoblin.db"
# Set to false to enable sending notices
email_debug_mode = true