From 463bc7593d2f7a599e6121a04774f2a028576780 Mon Sep 17 00:00:00 2001 From: Celestino Rey Date: Wed, 2 Oct 2024 21:31:38 +0200 Subject: [PATCH] =?UTF-8?q?Versi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JugarAlPadel/K8S/Makefile | 8 +------- .../gestion_reservas/gestion_reservas/settings.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/JugarAlPadel/K8S/Makefile b/JugarAlPadel/K8S/Makefile index 1dba8eb..fd38374 100644 --- a/JugarAlPadel/K8S/Makefile +++ b/JugarAlPadel/K8S/Makefile @@ -1,13 +1,7 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') -<<<<<<< HEAD #export REGISTRY=localhost:5000 export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.14 -======= -export REGISTRY=localhost:5000 -#export REGISTRY=registry.reymota.es -export IMG_VERSION = 0.04 ->>>>>>> fb4214658b6a7ae3582bb2ee6bcacd939c9c2698 +export IMG_VERSION = 0.15 export IMG_NGINX_VERSION = 2.3 # limpia todo diff --git a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py index 679b5b4..e69b9d3 100644 --- a/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py +++ b/JugarAlPadel/gestion_reservas/gestion_reservas/settings.py @@ -166,5 +166,5 @@ EMAIL_USE_TLS = True # DEFAULT_FROM_EMAIL = 'devesaparkpadel@gmail.com' EMAIL_HOST_USER = 'jugaralpadelentreamigos@gmail.com' -EMAIL_HOST_PASSWORD = 'tlaxyhxeacsaumzx' # Es mejor usar una contraseña de aplicación de Google +EMAIL_HOST_PASSWORD = 'oxdkclbtggewxhqc' # Es mejor usar una contraseña de aplicación de Google DEFAULT_FROM_EMAIL = 'jugaralpadelentreamigos@gmail.com'