Ensure accounts are created before the dev recipe runs

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index d03b8b204afee5cbb7dff52bda9df35a7d0fdf6d..98fec78b50a6edd84ce562ff8aafd9b83af11740 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,6 +20,7 @@
 require "yaml"
 require "securerandom"
 
 require "yaml"
 require "securerandom"
 

+include_recipe "accounts"

 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"
 include_recipe "apache"
 include_recipe "passenger"
 include_recipe "geoipupdate"


@@ -91,7 +92,7 @@ package %w[
   mailutils
   make
   nano
   mailutils
   make
   nano

-  netcat
+  netcat-openbsd

   osm2pgsql
   osmium-tool
   osmosis
   osm2pgsql
   osmium-tool
   osmosis


@@ -128,6 +129,7 @@ package %w[
   python3-dev
   python3-dotenv
   python3-gdal
   python3-dev
   python3-dotenv
   python3-gdal

+  python3-geojson

   python3-lxml
   python3-lz4
   python3-magic
   python3-lxml
   python3-lz4
   python3-magic


@@ -153,10 +155,6 @@ end
 
 nodejs_package "svgo"
 
 
 nodejs_package "svgo"
 

-python_package "geojson" do
-  python_version "3"
-end
-

 apache_module "env"
 apache_module "expires"
 apache_module "headers"
 apache_module "env"
 apache_module "expires"
 apache_module "headers"