Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
ldap-docker
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
shore
ldap-docker
Commits
d465da2f
Commit
d465da2f
authored
2 years ago
by
nimrod
Browse files
Options
Downloads
Patches
Plain Diff
Fix LAM's config patch.
I don't know why but the config changed somewhere along the line.
parent
f3485dc7
No related branches found
No related tags found
No related merge requests found
Pipeline
#3006
failed
2 years ago
Stage: .pre
Stage: build
Stage: deploy
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ldap-account-manager/patch.diff
+24
-21
24 additions, 21 deletions
ldap-account-manager/patch.diff
with
24 additions
and
21 deletions
ldap-account-manager/patch.diff
+
24
−
21
View file @
d465da2f
--- /etc/ldap-account-manager/config.cfg 2019-03-25 18:21:36.000000000 +0200
+++ /etc/ldap-account-manager/config.cfg 2019-06-25 14:18:51.906120546 +0300
@@ -9,4 +9,4 @@
logLevel: 4
# log destination
-logDestination: SYSLOG
+logDestination: /dev/stdout
--- /etc/apache2/sites-available/000-default.conf 2018-11-03 13:34:33.000000000 +0200
+++ /etc/apache2/sites-available/000-default.conf 2019-06-25 14:55:43.956626591 +0300
@@ -18,7 +18,7 @@
...
...
@@ -26,6 +18,17 @@
</VirtualHost>
# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
--- /etc/apache2/mods-available/status.conf 2019-04-03 00:13:44.000000000 +0300
+++ /etc/apache2/mods-available/status.conf 2019-11-09 19:59:09.642896703 +0200
@@ -5,7 +5,7 @@
<Location /server-status>
SetHandler server-status
- Require local
+ #Require local
#Require ip 192.0.2.0/24
</Location>
--- /var/lib/ldap-account-manager/config/lam.conf 2019-09-20 23:14:19.000000000 +0300
+++ /var/lib/ldap-account-manager/config/lam.conf 2019-09-20 23:59:56.291338527 +0300
@@ -5,22 +5,22 @@
...
...
@@ -36,7 +39,7 @@
+ServerURL: ${LDAP_URI}
# list of users who are allowed to use LDAP Account Manager
# names have to be sep
e
rated by semicolons
# names have to be sep
a
rated by semicolons
# e.g. admins: cn=admin,dc=yourdomain,dc=org;cn=root,dc=yourdomain,dc=org
-Admins: cn=Manager,dc=my-domain,dc=com
+Admins: ${LDAP_ADMIN_DN}
...
...
@@ -46,8 +49,8 @@
# suffix of tree view
# e.g. dc=yourdomain,dc=org
-t
rees
uffix: dc=yourdomain,dc=org
+t
rees
uffix: ${LDAP_BASE_DN}
-t
ools: treeViewS
uffix: dc=yourdomain,dc=org
+t
ools: treeViewS
uffix: ${LDAP_BASE_DN}
# default language (a line from config/language)
-defaultLanguage: en_GB.utf8
...
...
@@ -55,7 +58,7 @@
# Path to external Script
scriptPath:
@@ -5
2
,11 +5
2
,11 @@
@@ -5
5
,11 +5
5
,11 @@
activeTypes: user,group
...
...
@@ -69,14 +72,14 @@
types: attr_group: #cn;#gidNumber;#memberUID;#description
types: modules_group: posixGroup
--- /etc/apache2/mods-available/status.conf 2019-04-03 00:13:44.000000000 +0300
+++ /etc/apache2/mods-available/status.conf 2019-11-09 19:59:09.642896703 +0200
@@ -5,7 +5,7 @@
--- /etc/ldap-account-manager/config.cfg 2019-03-25 18:21:36.000000000 +0200
+++ /etc/ldap-account-manager/config.cfg 2019-06-25 14:18:51.906120546 +0300
@@ -9,7 +9,7 @@
logLevel: 4
<Location /server-status>
SetHandler server-status
- Require local
+ #Require local
#Require ip 192.0.2.0/24
</Location>
# log destination
-logDestination: SYSLOG
+logDestination: /dev/fd/1
configDatabaseType: files
configDatabaseServer:
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment