From f1f6e58ef81089400d7b1d9ce5536eda43bca0ca Mon Sep 17 00:00:00 2001
From: smarcet <smarcet@gmail.com>
Date: Mon, 27 Jan 2020 22:15:57 -0300
Subject: [PATCH] Fixed broken deployment

Refactored to support Doctrine ORM
and Laravel Queues

Change-Id: Iea078ee1e7d2541872b3b6966825eb6988fd266e
---
 manifests/init.pp   |  5 +++++
 templates/.env.erb  | 20 ++++++--------------
 templates/vhost.erb |  4 ----
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index d291998..ba7770c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -100,6 +100,10 @@ class openstackid (
   $registration_url = '',
   $registration_mobile_url = '',
   $resend_verification_url = '',
+  $queue_driver = 'database',
+  $queue_conn = 'openstackid',
+  $mail_from_email = 'no-reply@openstack.org',
+  $mail_from_name = 'no-reply@openstack.org',
 ) {
 
   # php5 packages needed for openid server
@@ -126,6 +130,7 @@ class openstackid (
     'php7.2-gmp',
     'php7.2-xml',
     'php7.2-zip',
+    'php7.2-mbstring',
   ]
 
   if($php_version == 7 ){
diff --git a/templates/.env.erb b/templates/.env.erb
index 0cde07f..ec80fbe 100644
--- a/templates/.env.erb
+++ b/templates/.env.erb
@@ -12,12 +12,6 @@ DB_DATABASE="<%= @id_db_name %>"
 DB_USERNAME="<%= @id_mysql_user %>"
 DB_PASSWORD="<%= @id_mysql_password %>"
 
-SS_DB_DRIVER=mysql
-SS_DB_HOST="<%= @ss_mysql_host %>"
-SS_DATABASE="<%= @ss_db_name %>"
-SS_DB_USERNAME="<%= @ss_mysql_user %>"
-SS_DB_PASSWORD="<%= @ss_mysql_password %>"
-
 DB_USE_SSL=<%= @mysql_ssl_enabled %>
 DB_MYSQL_ATTR_SSL_CA="<%= @mysql_ssl_ca_file %>"
 DB_MYSQL_ATTR_SSL_KEY="<%= @mysql_ssl_client_key_file %>"
@@ -29,6 +23,10 @@ REDIS_PORT=<%= @redis_port %>
 REDIS_DB=<%= @redis_db %>
 REDIS_PASSWORD="<%= @redis_password %>"
 
+QUEUE_DRIVER="<%= @queue_driver %>"
+QUEUE_CONN="<%= @queue_conn %>"
+QUEUE_DATABASE="<%= @id_db_name %>"
+
 CACHE_DRIVER="<%= @cache_driver %>"
 
 SESSION_DRIVER="<%= @session_driver %>"
@@ -42,10 +40,6 @@ SESSION_COOKIE_SECURE=<%= @session_cookie_secure %>
 SESSION_COOKIE_HTTP_ONLY=<%= @session_cookie_http_only %>
 
 MAIL_DRIVER="<%= @email_driver %>"
-MAIL_HOST="<%= @email_smtp_server %>"
-MAIL_PORT=<%= @email_smtp_server_port %>
-MAIL_USERNAME="<%= @email_smtp_server_user %>"
-MAIL_PASSWORD="<%= @email_smtp_server_password %>"
 SENDGRID_API_KEY="<%= @email_send_grid_api_key %>"
 
 CORS_ALLOWED_HEADERS="origin, content-type, accept, authorization, x-requested-with"
@@ -73,7 +67,5 @@ RECAPTCHA_PUBLIC_KEY="<%= @id_recaptcha_public_key %>"
 RECAPTCHA_PRIVATE_KEY="<%= @id_recaptcha_private_key %>"
 RECAPTCHA_TEMPLATE="<%= @id_recaptcha_template %>"
 
-LOST_PASSWORD_URL="<%= @lost_password_url %>"
-REGISTRATION_URL="<%= @registration_url %>"
-REGISTRATION_MOBILE_URL="<%= @registration_mobile_url %>"
-RESEND_VERIFICATION_URL="<%= @resend_verification_url %>"
\ No newline at end of file
+MAIL_FROM_EMAIL="<%= @mail_from_email %>"
+MAIL_FROM_NAME="<%= @mail_from_name %>"
diff --git a/templates/vhost.erb b/templates/vhost.erb
index 02fd83e..186d376 100644
--- a/templates/vhost.erb
+++ b/templates/vhost.erb
@@ -30,10 +30,6 @@
 <% end %>
 
   RewriteEngine on
-  RewriteRule ^/lost-password/?$  <%= scope.lookupvar("openstackid::assets_base_url") %>Security/lostpassword [R=301,NC,L]    # Permanent Move
-  RewriteRule ^/registration/?$  <%= scope.lookupvar("openstackid::assets_base_url") %>join/register [R=301,NC,L]    # Permanent Move
-  RewriteRule ^/registration-mobile/?$  <%= scope.lookupvar("openstackid::assets_base_url") %>join/register/mobile/community [R=301,NC,L]    # Permanent Move
-  RewriteRule ^/resend-verification/?$  <%= scope.lookupvar("openstackid::assets_base_url") %>members/verification/resend [R=301,NC,L]    # Permanent Move
 
   RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("openstackid::vhost_name") %>
   RewriteRule ^.*$ <%= scope.lookupvar("openstackid::canonicalweburl") %>