Skip to content

Commit 482ef54

Browse files
committed
Cleaning
- delete envoy - update Envoy.blade.php - update envoy.example
1 parent 5eed1b8 commit 482ef54

File tree

4 files changed

+5
-40
lines changed

4 files changed

+5
-40
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ yarn-error.log
1818
/.fleet
1919
/.idea
2020
/.vscode
21+
envoy

Envoy.blade.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'TARGET_SERVER', 'TARGET_USER', 'TARGET_DIR',
1010
'REPOSITORY',
1111
'APP_NAME', 'APP_ENV', 'APP_DEBUG', 'APP_URL',
12-
'LDAP_HOST', 'LDAP_USERNAME', 'LDAP_PASSWORD', 'LDAP_BASE_DN', 'LDAP_BASE_DN_CESNET_CA',
12+
'LDAP_HOST', 'LDAP_USERNAME', 'LDAP_PASSWORD', 'LDAP_BASE_DN',
1313
'DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD',
1414
])->notEmpty();
1515
} catch(Exception $e) {
@@ -40,7 +40,6 @@
4040
$ldap_password = $_ENV['LDAP_PASSWORD'];
4141
$ldap_port = $_ENV['LDAP_PORT'] ?? '636';
4242
$ldap_base_dn = $_ENV['LDAP_BASE_DN'];
43-
$ldap_base_dn_cesnet_ca = $_ENV['LDAP_BASE_DN_CESNET_CA'];
4443
$ldap_ssl = $_ENV['LDAP_SSL'] ?? 'true';
4544
$ldap_tls = $_ENV['LDAP_TLS'] ?? 'false';
4645

@@ -108,7 +107,6 @@
108107
s%LDAP_PASSWORD=.*%LDAP_PASSWORD=\"{{ $ldap_password }}\"%; \
109108
s%LDAP_PORT=.*%LDAP_PORT={{ $ldap_port }}%; \
110109
s%LDAP_BASE_DN=.*%LDAP_BASE_DN=\"{{ $ldap_base_dn }}\"%; \
111-
s%LDAP_BASE_DN_CESNET_CA=.*%LDAP_BASE_DN_CESNET_CA=\"{{ $ldap_base_dn_cesnet_ca }}\"%; \
112110
s%LDAP_SSL=.*%LDAP_SSL={{ $ldap_ssl }}%; \
113111
s%LDAP_TLS=.*%LDAP_TLS={{ $ldap_tls }}%; \
114112
s%LOG_SLACK_WEBHOOK_URL=.*%LOG_SLACK_WEBHOOK_URL={{ $slack_hook }}%; \

envoy

Lines changed: 0 additions & 36 deletions
This file was deleted.

envoy.example

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ LDAP_USERNAME="uid=user,ou=People,dc=example,dc=org"
1919
LDAP_PASSWORD="SafePassw0rd!"
2020
LDAP_PORT=636
2121
LDAP_BASE_DN="ou=Organizations,dc=example,dc=org"
22-
LDAP_BASE_DN_CESNET_CA="dc=cesnet-ca,dc=cz"
2322
LDAP_SSL=true
2423
LDAP_TLS=false
2524

2625
LOG_SLACK_WEBHOOK_URL=https://hooks.example.org/services/token
2726
LOG_SLACK_CHANNEL=#ciselnik
2827

28+
MAIL_MAILER=smtp
29+
MAIL_HOST=server.example.org
30+
MAIL_PORT=25
2931
MAIL_FROM_ADDRESS="hello@example.com"
3032
MAIL_FROM_NAME="${APP_NAME}"
3133
MAIL_REPLYTO_ADDRESS="info@example.org"

0 commit comments

Comments
 (0)