Skip to content

Commit

Permalink
Merge pull request #2 from dentalwings/python3-Ubuntu20.04
Browse files Browse the repository at this point in the history
Switch to python3 on Ubuntu 20.04
  • Loading branch information
sel-aaraj authored Feb 5, 2021
2 parents 8c36b7f + 712ad54 commit c5bc329
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
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=python3-mysqldb state=installed
apt: name=python3-mysqldb state=present
tags:
- python

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

0 comments on commit c5bc329

Please # to comment.