Skip to content

Commit

Permalink
Actualizo instalación y actualización para aplicar configuraciones de…
Browse files Browse the repository at this point in the history
… ckanext-security (#255)

* Actualizo instalación y actualización para aplicar configuraciones de ckanext-security

* Logueo en funciones del instalador

* Actualizo versión de portal-base
  • Loading branch information
chdigiorno authored Aug 2, 2019
1 parent 792545d commit 47efd77
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions install/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def run(self):
self.configure_theme_volume()
self.update_configuration_file()
self.correct_ckan_public_files_permissions()
self.apply_additional_configurations()
self.restart_apps()
self.ping_nginx_until_200_response_or_timeout()
self.restart_workers()
Expand Down
13 changes: 13 additions & 0 deletions install/installation_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,19 @@ def get_config_file_field(self, name):
current_url = self.run_compose_command(cmd)
return current_url.replace(name, '')[1:] # guardamos sólo la url, ignoramos el símbolo '='

def apply_additional_configurations(self):
self.logger.info("Aplicando configuraciones adicionales...")
self.customize_ckanext_security_configurations()

def customize_ckanext_security_configurations(self):
self.logger.info("Realizando modificaciones a ckanext-security...")
SECURITY_SCRIPTS_PATH = "/etc/ckan_init.d/security/"
SECURITY_CONFIG_PATH = "/usr/lib/ckan/default/src/ckanext-security/ckanext/security/templates/security/emails/"
new_lockout_mail_file_src = "{}new_lockout_mail.txt".format(SECURITY_SCRIPTS_PATH)
new_lockout_mail_file_dest = "{}lockout_mail.txt".format(SECURITY_CONFIG_PATH)
cmd = 'exec portal bash -c "cp {0} {1}"'.format(new_lockout_mail_file_src, new_lockout_mail_file_dest)
self.run_compose_command(cmd)

def restart_apps(self):
self.logger.info("Reiniciando la aplicación...")
self.run_compose_command("restart")
Expand Down
1 change: 1 addition & 0 deletions install/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ def run(self):
if crontab_content:
self.restore_cron_jobs(crontab_content)
self.update_configuration_file()
self.apply_additional_configurations()
self.restart_apps()
self.ping_nginx_until_200_response_or_timeout()
self.restart_workers()
Expand Down

0 comments on commit 47efd77

Please sign in to comment.