dmca: move to container version

diff --git a/cookbooks/dmca/metadata.rb b/cookbooks/dmca/metadata.rb
index 9876562950f7c88f5a86e600a6710b9e2ebea945..f5a137faae69943c6bd6c9209f1a1b2116968f55 100644 (file)
--- a/cookbooks/dmca/metadata.rb
+++ b/cookbooks/dmca/metadata.rb
@@ -6,5 +6,4 @@ description       "Configure DMCA form"
 
 version           "1.0.0"
 supports          "ubuntu"
-depends           "apache"
-depends           "php"
+depends           "podman"

diff --git a/cookbooks/dmca/recipes/default.rb b/cookbooks/dmca/recipes/default.rb
index eafadd787a7d9ee6ef274341acd64a2b2d41278a..2b83f8d5477bc75f7cf4259f15105a6b538f2ee5 100644 (file)
--- a/cookbooks/dmca/recipes/default.rb
+++ b/cookbooks/dmca/recipes/default.rb
@@ -17,42 +17,9 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
-include_recipe "php::fpm"
+include_recipe "podman::apache"
 
-apache_module "proxy"
-apache_module "proxy_fcgi"
-
-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
-
-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
-  domains ["dmca.openstreetmap.org", "dmca.osm.org"]
-  notifies :reload, "service[apache2]"
-end
-
-php_fpm "dmca.openstreetmap.org" do
-  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
-
-apache_site "dmca.openstreetmap.org" do
-  template "apache.erb"
-  directory "/srv/dmca.openstreetmap.org"
-  variables :aliases => ["dmca.osm.org"]
+podman_site "dmca.openstreetmap.org" do
+  image "ghcr.io/openstreetmap/dmca-website:latest"
+  aliases ["dmca.osm.org"]
 end

diff --git a/cookbooks/dmca/templates/default/apache.erb b/cookbooks/dmca/templates/default/apache.erb
deleted file mode 100644 (file)
index d59bb7e..0000000
--- a/cookbooks/dmca/templates/default/apache.erb
+++ /dev/null
@@ -1,62 +0,0 @@
-# DO NOT EDIT - This file is being maintained by Chef
-
-<VirtualHost *:80>
-  ServerName <%= @name %>
-<% @aliases.each do |alias_name| -%>
-  ServerAlias <%= alias_name %>
-<% end -%>
-  ServerAdmin webmaster@openstreetmap.org
-
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
-  ErrorLog /var/log/apache2/<%= @name %>-error.log
-
-  RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
-  RedirectPermanent / https://<%= @name %>/
-</VirtualHost>
-<% unless @aliases.empty? -%>
-
-<VirtualHost *:443>
-  ServerName <%= @aliases.first %>
-<% @aliases.drop(1).each do |alias_name| -%>
-  ServerAlias <%= alias_name %>
-<% end -%>
-  ServerAdmin webmaster@openstreetmap.org
-
-  SSLEngine on
-  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
-  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
-
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
-  ErrorLog /var/log/apache2/<%= @name %>-error.log
-
-  RedirectPermanent / https://<%= @name %>/
-</VirtualHost>
-<% end -%>
-
-<VirtualHost *:443>
-  ServerName <%= @name %>
-  ServerAdmin webmaster@openstreetmap.org
-
-  SSLEngine on
-  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
-  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
-
-  CustomLog /var/log/apache2/<%= @name %>-access.log combined
-  ErrorLog /var/log/apache2/<%= @name %>-error.log
-
-  DocumentRoot <%= @directory %>
-
-  Options -Indexes
-</VirtualHost>
-
-<Directory <%= @directory %>>
-  Require all granted
-
-  <FilesMatch ".+\.ph(ar|p|tml)$">
-    SetHandler "proxy:unix:/run/php/php-<%= @name %>-fpm.sock|fcgi://127.0.0.1"
-  </FilesMatch>
-</Directory>
-
-<Directory ~ "\.git">
-  Require all denied
-</Directory>

diff --git a/roles/naga.rb b/roles/naga.rb
index aa9db6707817c3355cd6e04e0f15a33e9ed24511..6ed3323f46d6e69913c03226c98bca2322931df8 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -44,5 +44,6 @@ run_list(
   "recipe[foundation::welcome]",
   "recipe[stateofthemap::container]",
   "recipe[hot]",
-  "recipe[ideditor]"
+  "recipe[ideditor]",
+  "recipe[dmca]"
 )

diff --git a/roles/ridley.rb b/roles/ridley.rb
index b1b1e1e13d1ee1af22cd3033eb74f2b88365f4e9..08a97417dc6e79fdf6b7844b178988aed6472a76 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -44,6 +44,5 @@ run_list(
   "role[stateofthemap]",
   "role[blog]",
   "role[otrs]",
-  "recipe[dmca]",
   "recipe[dhcpd]"
 )