Merge pull request #22 from PedroHenriqueDevBR/dev

Dev
PedroHenriqueDevBR · Jul 24, 2023 · b6d8eb8 · b6d8eb8
2 parents b60834c + bed5c06
commit b6d8eb8
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -388,3 +388,5 @@ ldap_password/staticfiles/css/font-awesome-all.min.css
 ldap_password/staticfiles/images/logo.png
 ldap_password/staticfiles/js/bootstrap.bundle.min.js
 ldap_password/staticfiles/js/jquery.min.js
+ldap_password/dockerfiles/nginx/cert/ca.cer
+ldap_password/dockerfiles/nginx/cert/ca.key
diff --git a/ldap_password/apps/core/locale/pt_BR/LC_MESSAGES/django.mo b/ldap_password/apps/core/locale/pt_BR/LC_MESSAGES/django.mo
diff --git a/ldap_password/apps/core/locale/pt_BR/LC_MESSAGES/django.po b/ldap_password/apps/core/locale/pt_BR/LC_MESSAGES/django.po
@@ -24,7 +24,7 @@ msgstr "Sem conexão com o servidor"
 
 #: apps/core/services/ldap/change_password.py:37
 msgid "Rejected password update"
-msgstr "Alteração de senha recusada."
+msgstr "Senha informada não satisfaz os requisitos de senha do servidor."
 
 #: apps/core/services/ldap/search_user.py:97
 #: apps/core/services/ldap/search_user.py:120
@@ -72,8 +72,9 @@ msgstr "Nova senha"
 #: apps/core/templates/token_password.html:37
 msgid "password_rules"
 msgstr ""
-"A senha deve conter no mínimo 9 (nove) caracteres, letras maiúsculas, letras "
-"minúsculas e pelo menos um caractere especial"
+"A senha deve conter no mínimo 9 (nove) caracteres, letras maiúsculas e "
+"minúsculas, pelo menos um caractere especial, deve ser diferente das senhas já utilzadas "
+"e não pode conter o seu nome na senha."
 
 #: apps/core/templates/password.html:48
 #: apps/core/templates/token_password.html:40

diff --git a/ldap_password/apps/core/templates/base.html b/ldap_password/apps/core/templates/base.html
@@ -9,6 +9,9 @@
     <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
     <link rel="stylesheet" href="{% static '/css/font-awesome-all.min.css' %}" />
     <link rel="stylesheet" href="{% static '/css/custom.css' %}">
+    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'images/logo.png' %}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{% static 'images/logo.png' %}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{% static 'images/logo.png' %}">
     <title>LDAP Password - {% block title %} {% endblock title %}</title>
 </head>
 

diff --git a/ldap_password/default.conf b/ldap_password/default.conf
@@ -35,3 +35,35 @@ server {
 	#access_log  /var/log/nginx/temp.otaviomiranda.com.br-access.log;
 	error_log   /var/log/nginx/temp.otaviomiranda.com.br-error.log;
 }
+
+server {
+	listen 8443 ssl;
+	listen [::]:8443 ssl;
+
+	server_name _;
+
+	# SSL
+	ssl on;
+	ssl_certificate /etc/nginx/cert/ca.cer;
+	ssl_certificate_key /etc/nginx/cert/ca.key;
+
+	location / {
+        proxy_pass http://web:8000/;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Host $host;
+        proxy_redirect off;
+    }
+
+	location /static/ {
+		alias /code/staticfiles/;
+	}
+
+	location /media {
+		alias /code/mediafiles/;
+	}
+
+	access_log off;
+	#access_log  /var/log/nginx/temp.otaviomiranda.com.br-access.log;
+	error_log   /var/log/nginx/temp.otaviomiranda.com.br-error.log;
+}
diff --git a/ldap_password/docker-compose.prod.yml b/ldap_password/docker-compose.prod.yml
@@ -64,6 +64,7 @@ services:
     ports:
       - 80:80
       - 443:443
+      - 8443:443
     depends_on:
       - web