Merge branch 'release/1.1.0'

Author: klen

CONTRIBUTORS

@@ -0,0 +1,4 @@
+Contributors:
+
+* Kirill Klenov (http://klen.github.io/)
+* Evgeny Gorchakov (https://github.com/evgorchakov)

README.md

@@ -25,7 +25,8 @@ The role variables and default values.
 sentry_enabled: yes                                       # Enable the role
 sentry_home: /usr/lib/sentry                              # Deploy sentry to the folder
 sentry_user: sentry                                       # Run as user
-sentry_hostname: "{{inventory_hostname}}"                 # Bind to hostname
+sentry_hostname: "{{inventory_hostname}}"
+sentry_https_url: no
 sentry_secret_key: 1LsmGR1DIyCJ5n2bRG5IVOFHdzEPkTKlW0RzxZVe9S0vc
 sentry_extensions: []                                     # List of sentry-extensions
 
@@ -88,6 +89,11 @@ sentry_email_settings: []                                 # Ex. sentry_email_set
                                                           #       - EMAIL_HOST_USER = ''
                                                           #       - EMAIL_PORT = 25
                                                           #       - EMAIL_USE_TLS = False
+
+# The following parameters are for toggling dependencies
+redis_enabled: yes
+nginx_enabled: yes
+python_enabled: yes
 ```
 
 #### Usage

defaults/main.yml

@@ -3,7 +3,8 @@
 sentry_enabled: yes                                       # Enable the role
 sentry_home: /usr/lib/sentry                              # Deploy sentry to the folder
 sentry_user: sentry                                       # Run as user
-sentry_hostname: "{{inventory_hostname}}"                 # Bind to hostname
+sentry_hostname: "{{inventory_hostname}}"
+sentry_https_url: no
 sentry_secret_key: 1LsmGR1DIyCJ5n2bRG5IVOFHdzEPkTKlW0RzxZVe9S0vc
 sentry_extensions: []                                     # List of sentry-extensions
 
@@ -66,3 +67,8 @@ sentry_email_settings: []                                 # Ex. sentry_email_set
                                                           #       - EMAIL_HOST_USER = ''
                                                           #       - EMAIL_PORT = 25
                                                           #       - EMAIL_USE_TLS = False
+
+# The following parameters are for toggling dependencies
+redis_enabled: yes
+nginx_enabled: yes
+python_enabled: yes

tasks/sentry.yml

@@ -19,7 +19,7 @@
   sudo: yes
   sudo_user: "{{sentry_user}}"
 
-- name: Install requirements
+- name: Install requirements for Redis
   pip: name={{item}} executable={{sentry_home}}/env/bin/pip
   with_items:
     - redis
@@ -28,6 +28,13 @@
     - django-redis-cache
   sudo: yes
   sudo_user: "{{sentry_user}}"
+  when: redis_enabled
+
+- name: Install requirements for MySQL
+  pip: name={{ item }} executable={{ sentry_home }}/env/bin/pip
+  with_items:
+    - mysql-python
+  when: "'mysql' in sentry_db_engine|lower()"
 
 - name: Install extensions
   pip: name={{item}} executable={{sentry_home}}/env/bin/pip
@@ -72,6 +79,7 @@
   template: src=nginx.conf.j2 dest={{nginx_sites_dir}}/sentry.conf
   notify:
     - nginx reload
+  when: nginx_enabled
 
 - name: Setup logrotate
   template: src=logrotate.conf.j2 dest=/etc/logrotate.d/sentry.conf

templates/config.py.j2

@@ -8,7 +8,7 @@ import os.path
 CONF_ROOT = os.path.dirname(__file__)
 
 SECRET_KEY = '{{sentry_secret_key}}'
-SENTRY_URL_PREFIX = 'http://{{sentry_hostname}}'
+SENTRY_URL_PREFIX = '{{ "https" if sentry_https_url else "http" }}://{{sentry_hostname}}'
 
 DATABASES = {
     'default': {

templates/logrotate.conf.j2

@@ -2,32 +2,32 @@
 # Do NOT modify this file by hand!
 
 {{sentry_home}}/uwsgi.log {
-  - create 644 {{sentry_user}} {{sentry_user}}
-  - compress
-  - copytruncate
-  - daily
-  - dateext
-  - rotate 7
-  - size 1M
+  create 644 {{sentry_user}} {{sentry_user}}
+  compress
+  copytruncate
+  daily
+  dateext
+  rotate 7
+  size 1M
 }
 
 {{sentry_home}}/log/nginx.log {
-  - create 644 {{sentry_user}} {{sentry_user}}
-  - compress
-  - copytruncate
-  - daily
-  - dateext
-  - rotate 7
-  - size 1M
+  create 644 {{sentry_user}} {{sentry_user}}
+  compress
+  copytruncate
+  daily
+  dateext
+  rotate 7
+  size 1M
 }
 
 {{sentry_home}}/log/nginx-errors.log {
-  - create 644 {{sentry_user}} {{sentry_user}}
-  - compress
-  - copytruncate
-  - daily
-  - dateext
-  - rotate 7
-  - size 1M
+  create 644 {{sentry_user}} {{sentry_user}}
+  compress
+  copytruncate
+  daily
+  dateext
+  rotate 7
+  size 1M
 }