civicrm: fix redirect to keep url

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 047a70d72115ea0ce1e9f67bd4bfa3b475f249f3..907a4eb463c07f7642a5d0365ffd7cb4ff201744 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -35,10 +35,59 @@ include_recipe "ruby"
 
 package %w[
   ant
 
 package %w[
   ant

+  aria2
+  at
+  autoconf
+  automake
+  awscli
+  composer

   default-jdk-headless
   default-jre-headless
   default-jdk-headless
   default-jre-headless

+  fonts-dejavu
+  fonts-dejavu-core
+  fonts-dejavu-extra
+  fonts-droid-fallback
+  fonts-liberation
+  fonts-noto-mono
+  g++
+  gcc
+  gdal-bin
+  gnuplot-nox

   golang
   golang

-  composer
+  graphviz
+  irssi
+  jq
+  libargon2-dev
+  libboost-date-time-dev
+  libboost-dev
+  libboost-filesystem-dev
+  libboost-locale-dev
+  libboost-program-options-dev
+  libboost-regex-dev
+  libboost-system-dev
+  libcrypto++-dev
+  libfcgi-dev
+  libfmt-dev
+  libjson-xs-perl
+  libmemcached-dev
+  libpqxx-dev
+  libtool
+  libxml2-dev
+  libyajl-dev
+  lua-any
+  luajit
+  lz4
+  lzip
+  lzop
+  mailutils
+  make
+  nano
+  netcat
+  osm2pgsql
+  osmosis
+  pandoc
+  pandoc
+  pbzip2

   php-apcu
   php-cgi
   php-cli
   php-apcu
   php-cgi
   php-cli


@@ -55,8 +104,11 @@ package %w[
   php-pgsql
   php-sqlite3
   php-xml
   php-pgsql
   php-sqlite3
   php-xml

+  pigz

   pngcrush
   pngquant
   pngcrush
   pngquant

+  proj-bin
+  python-is-python3

   python3
   python3-brotli
   python3-bs4
   python3
   python3-brotli
   python3-bs4


@@ -64,69 +116,22 @@ package %w[
   python3-dateutil
   python3-dev
   python3-dotenv
   python3-dateutil
   python3-dev
   python3-dotenv

+  python3-gdal

   python3-lxml
   python3-lz4
   python3-magic
   python3-pil
   python3-psycopg2
   python3-pyproj
   python3-lxml
   python3-lz4
   python3-magic
   python3-pil
   python3-psycopg2
   python3-pyproj

-  python3-gdal
-  gdal-bin
-  proj-bin
-  g++
-  gcc
-  make
-  autoconf
-  automake
-  libtool
-  libargon2-dev
-  libfcgi-dev
-  libxml2-dev
-  libmemcached-dev
-  libboost-dev
-  libboost-regex-dev
-  libboost-system-dev
-  libboost-program-options-dev
-  libboost-date-time-dev
-  libboost-filesystem-dev
-  libboost-locale-dev
-  libpqxx-dev
-  libcrypto++-dev
-  libyajl-dev
-  libfmt-dev
-  zlib1g-dev
-  nano
-  osm2pgsql
-  osmosis
-  at
-  awscli
-  mailutils
-  lua-any
-  luajit
-  fonts-dejavu
-  fonts-dejavu-core
-  fonts-dejavu-extra
-  fonts-droid-fallback
-  fonts-liberation
-  fonts-noto-mono
-  gnuplot-nox
-  graphviz
-  irssi
-  jq
-  lz4
-  lzip
-  lzop
-  pbzip2
-  pigz
+  python3-venv
+  r-base
+  redis
+  tmux

   unrar
   unzip
   unrar
   unzip

-  zip
-  netcat
-  tmux

   whois
   whois

-  redis
-  r-base
-  pandoc
+  zip
+  zlib1g-dev

 ]
 
 # Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data
 ]
 
 # Add uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for reprojecting OS data


@@ -239,7 +244,7 @@ search(:accounts, "*:*").each do |account|
                "memory_limit" => "128M",
                "post_max_size" => "32M",
                "upload_max_filesize" => "32M"
                "memory_limit" => "128M",
                "post_max_size" => "32M",
                "upload_max_filesize" => "32M"

-    php_admin_values "sendmail_path" => "/usr/sbin/sendmail -t -i -f #{name}@errol.openstreetmap.org",
+    php_admin_values "sendmail_path" => "/usr/sbin/sendmail -t -i -f #{name}@dev.openstreetmap.org",

                      "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/"
     php_flags "display_errors" => "on"
   end
                      "open_basedir" => "/home/#{name}/:/tmp/:/usr/share/php/"
     php_flags "display_errors" => "on"
   end


@@ -268,9 +273,9 @@ node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}-postgis-3"
 end
 
   package "postgresql-#{version}-postgis-3"
 end
 

-if node[:postgresql][:clusters][:"14/main"]
+if node[:postgresql][:clusters][:"15/main"]

   postgresql_user "apis" do
   postgresql_user "apis" do

-    cluster "14/main"
+    cluster "15/main"

   end
 
   template "/usr/local/bin/cleanup-rails-assets" do
   end
 
   template "/usr/local/bin/cleanup-rails-assets" do


@@ -291,7 +296,12 @@ if node[:postgresql][:clusters][:"14/main"]
     restart "on-failure"
     nice 10
     sandbox :enable_network => true
     restart "on-failure"
     nice 10
     sandbox :enable_network => true

-    read_write_paths "/srv/%i.apis.dev.openstreetmap.org/logs"
+    restrict_address_families "AF_UNIX"
+    memory_deny_write_execute false
+    read_write_paths [
+      "/srv/%i.apis.dev.openstreetmap.org/logs",
+      "/srv/%i.apis.dev.openstreetmap.org/rails/storage"
+    ]

   end
 
   systemd_service "cgimap@" do
   end
 
   systemd_service "cgimap@" do


@@ -327,12 +337,12 @@ if node[:postgresql][:clusters][:"14/main"]
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do
       secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
       postgresql_database database_name do

-        cluster "14/main"
+        cluster "15/main"

         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do
         owner "apis"
       end
 
       postgresql_extension "#{database_name}_btree_gist" do

-        cluster "14/main"
+        cluster "15/main"

         database database_name
         extension "btree_gist"
       end
         database database_name
         extension "btree_gist"
       end


@@ -373,7 +383,7 @@ if node[:postgresql][:clusters][:"14/main"]
         group "apis"
         repository details[:repository]
         revision details[:revision]
         group "apis"
         repository details[:repository]
         revision details[:revision]

-        database_port node[:postgresql][:clusters][:"14/main"][:port]
+        database_port node[:postgresql][:clusters][:"15/main"][:port]

         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"
         database_name database_name
         database_username "apis"
         email_from "OpenStreetMap <web@noreply.openstreetmap.org>"


@@ -444,7 +454,7 @@ if node[:postgresql][:clusters][:"14/main"]
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,
           group "root"
           mode "640"
           variables :cgimap_port => cgimap_port,

-                    :database_port => node[:postgresql][:clusters][:"14/main"][:port],
+                    :database_port => node[:postgresql][:clusters][:"15/main"][:port],

                     :database_name => database_name,
                     :log_directory => log_directory
         end
                     :database_name => database_name,
                     :log_directory => log_directory
         end


@@ -514,7 +524,7 @@ if node[:postgresql][:clusters][:"14/main"]
 
       postgresql_database database_name do
         action :drop
 
       postgresql_database database_name do
         action :drop

-        cluster "14/main"
+        cluster "15/main"

       end
     end
   end
       end
     end
   end