Provisioning: apt & pip packages

thsur · Mar 20, 2021 · abb790e · abb790e
1 parent a5cd4ce
commit abb790e
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 
+/user/*
+!/user/.gitkeep
+
 tmp/
 
 # Ansible

diff --git a/Rakefile.rb b/Rakefile.rb
@@ -145,7 +145,7 @@ def generate_ansible_files
   end
 
   desc 'Pause dev machine.'
-  task :halt do
+  task :suspend do
     cd('vagrant') do
       sh 'vagrant suspend'
     end
@@ -236,11 +236,15 @@ def generate_ansible_files
   desc  = {}
 
   puts
-  puts 'VM'
+  puts '=' * 40
+  puts '|' << ' ' * 38 << '|'
+  puts '|' << ' ' * 16 << 'DevOps' << ' ' * 16 << '|'
+  puts '|' << ' ' * 38 << '|'
+  puts '=' * 40
   puts
   puts 'Usage:'
   puts 'rake TASK, e.g. rake ' + tasks[0].name
-  puts
+  puts 
 
   tasks.each do |t|
 
@@ -257,7 +261,6 @@ def generate_ansible_files
 
     title = "* #{ns.upcase} *"
 
-    puts
     puts "-" * title.length
     puts title
     puts "-" * title.length

diff --git a/ansible/plays/provision/playbook.yml b/ansible/plays/provision/playbook.yml
@@ -34,8 +34,8 @@
         name: common
     - include_role:
         name: geerlingguy.firewall
-    - include_role:
-        name: geerlingguy.pip
+    # - include_role:
+    #     name: geerlingguy.pip
     # - include_role:
     #     name: geerlingguy.memcached
     # - include_role:

diff --git a/ansible/plays/provision/vars/main.yml b/ansible/plays/provision/vars/main.yml
@@ -36,16 +36,23 @@ composer_global_packages:
 #
 # apt
 # 
-apt_extra_ppa:
-  # Ubuntu 14 comes with Apache 2.4.7, but we need at least Apache 2.4.9 
-  # for PHP-FPM with SetHandler (see below) to work, so we need to install 
-  # an extra PPA. 
-  - "ppa:ondrej/apache2"
-
+apt_extra_ppa: []
+
 apt_extra_packages:
+  - silversearcher-ag
+  - python3-pip
+  - aptitude
+  - apache2
   - sqlite
   - unzip
 
+#
+# Python packages
+# 
+pip_extra_packages:
+  - virtualenv
+  - pyopenssl
+
 #
 # MySQL
 #
@@ -65,12 +72,6 @@ mysql_slow_query_log_enabled: true
 mysql_slow_query_time: 2
 mysql_wait_timeout: 300
 
-#
-# Python packages
-# 
-pip_install_packages:
-  - pyopenssl
-
 #
 # Apache
 # 

diff --git a/ansible/requirements.yml b/ansible/requirements.yml
@@ -7,7 +7,6 @@
 - src: geerlingguy.apache-php-fpm
 - src: geerlingguy.composer
 - src: geerlingguy.firewall
-- src: geerlingguy.pip
 - src: geerlingguy.mysql
 - src: geerlingguy.mailhog
 - src: weareinteractive.environment

diff --git a/ansible/roles/custom/common/tasks/main.yml b/ansible/roles/custom/common/tasks/main.yml
@@ -25,35 +25,33 @@
   with_items: "{{ apt_extra_ppa }}"
   when: apt_extra_ppa | length
 
-# Install default packages
+# Keep apt packages up to date
 
 - name: Update apt cache
   apt:
     update_cache: yes
     cache_valid_time: 86400 # twenty-four hours
 
-- name: Install Nano
+- name: Upgrade apt packages
   apt:
-    name: nano
-    state: present
-
-- name: Install Silver Searcher (ag)
-  apt:
-    name: silversearcher-ag
-    state: present
-
-- name: Install Git
-  apt:
-    name: git
-    state: present
+    upgrade: safe
 
 # Install extra packages
 
 - name: Install extra apt packages
-  apt: "name={{ apt_extra_packages | list }} state=present"
+  apt: 
+    pkg: "{{ apt_extra_packages }}"
   when: apt_extra_packages | length
 
+# Install extra Python packages
+
+- name: Install extra pip packages
+  pip:
+    name: "{{ pip_extra_packages }}"
+
 # Generate language file
 
-- name: Install language(s)
-  command: "locale-gen de_DE.UTF-8"
+- name: Install locale(s)
+  locale_gen:
+    name: de_DE.UTF-8
+    state: present
diff --git a/user/.gitkeep b/user/.gitkeep
diff --git a/vagrant/config.yml b/vagrant/config.yml
@@ -6,6 +6,6 @@ ip: 0.0.0.0  # Auto-configure a guest's ip. Requires www-data-auto_network.
              # Change to some address from the private address space to give it a fixed ip (like '192.168.0.99').
 
 box:
-  type: bento/ubuntu-16.04 # Cf. https://www.vagrantup.com/docs/boxes#official-boxes
+  type: bento/ubuntu-20.10 # Cf. https://www.vagrantup.com/docs/boxes#official-boxes
   memory: 2048
   cpus: 1