Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use S3 signature version 4 by default #4

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
with_items:
- autoconf
- build-essential
- python-setuptools
- python-software-properties
- python-dev
- python-pip
- python3-setuptools
- python3-software-properties
- python3-dev
- python3-pip
- libncurses-dev

# CIS CAT secuirty configurations
Expand Down Expand Up @@ -299,7 +299,7 @@
- x_window

- name: disable apport
lineinfile: dest=/etc/init/apport.conf regexp="^env enabled" line="env enabled=0"
lineinfile: dest=/etc/default/apport regexp="^enabled" line="enabled=0"
become: true
tags:
- cis_cat_security
Expand Down Expand Up @@ -397,4 +397,4 @@
apt: name=telnet state=absent update_cache=yes
tags:
- cis_cat_security
- disable_telnet
- disable_telnet
4 changes: 3 additions & 1 deletion roles/sentry/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ other_python_pkgs:
- libffi-dev
- libjpeg-dev
- libxml2-dev
- libxmlsec1-dev
- libxmlsec1-openssl
- libxslt-dev
- libyaml-dev
- libpq-dev
Expand All @@ -18,4 +20,4 @@ other_python_pkgs:
- libblas-dev
- liblapack-dev
- libatlas-base-dev
- python-passlib
- python3-passlib
4 changes: 2 additions & 2 deletions roles/sentry/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- python

- name: Install all relevant files for server
pip: name={{item}} executable=pip
pip: name={{item}} executable=pip3
with_items:
- urllib3
- pyopenssl
Expand All @@ -18,7 +18,7 @@
- python

- name: install python mysql bindings for mysql commands
apt: name=python-mysqldb state=installed
apt: name=python3-mysqldb state=present
tags:
- python

Expand Down
5 changes: 4 additions & 1 deletion roles/sentry/templates/nginx-sentry.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ server {
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";

# increased upload max size
client_max_body_size 10m;

server_name {{sentry_url}};

location / {
Expand All @@ -21,4 +24,4 @@ server {
proxy_set_header X-Forwarded-Proto $scheme;
add_header Strict-Transport-Security "max-age=31536000";
}
}
}
1 change: 1 addition & 0 deletions roles/sentry/templates/sentry_yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ redis.clusters:
filestore.backend: 's3'
filestore.options:
bucket_name: '{{ sentry_files_bucket_name }}'
signature_version: 's3v4'
{% else %}
filestore.backend: 'filesystem'
filestore.options:
Expand Down
4 changes: 2 additions & 2 deletions site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
- name: Update apt packages
raw: apt-get update
- name: Install python
raw: apt-get install python-minimal aptitude -y
raw: apt-get install python3 aptitude -y
- name: Gather facts
action: setup
become: yes
Expand All @@ -28,7 +28,7 @@
- name: Update apt packages
raw: apt-get update
- name: Install python
raw: apt-get install python-minimal aptitude -y
raw: apt-get install python3 aptitude -y
- name: Gather facts
action: setup
become: yes # become sudo