X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/eecaf26698348adf3d3b64ea680ad82f959a5ae4..7a7fd0eb655e96b6e43ff3a22598c7f68b83c699:/cookbooks/dmca/recipes/default.rb diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb index f7f9cfadb..eafadd787 100644 --- a/cookbooks/dmca/recipes/default.rb +++ b/cookbooks/dmca/recipes/default.rb @@ -23,20 +23,21 @@ include_recipe "php::fpm" apache_module "proxy" apache_module "proxy_fcgi" -directory "/srv/dmca.openstreetmap.org" do - owner "root" - group "root" - mode "755" +package "composer" + +git "/srv/dmca.openstreetmap.org" do + action :sync + repository "https://github.com/openstreetmap/dmca-website.git" + revision "main" + depth 1 + notifies :run, "execute[/srv/dmca.openstreetmap.org/composer.json]", :immediately end -remote_directory "/srv/dmca.openstreetmap.org/html" do - source "html" - owner "root" - group "root" - mode "755" - files_owner "root" - files_group "root" - files_mode "644" +execute "/srv/dmca.openstreetmap.org/composer.json" do + action :nothing + command "composer install --no-dev" + cwd "/srv/dmca.openstreetmap.org/" + environment "COMPOSER_HOME" => "/srv/dmca.openstreetmap.org/" end ssl_certificate "dmca.openstreetmap.org" do @@ -45,7 +46,7 @@ ssl_certificate "dmca.openstreetmap.org" do end php_fpm "dmca.openstreetmap.org" do - php_admin_values "open_basedir" => "/srv/dmca.openstreetmap.org/html/:/usr/share/php/:/tmp/", + php_admin_values "open_basedir" => "/srv/dmca.openstreetmap.org/:/usr/share/php/:/tmp/", "disable_functions" => "exec,shell_exec,system,passthru,popen,proc_open" prometheus_port 11201 end