Skip to content

Commit

Permalink
Release 6.6.1 - See CHANGELOG
Browse files Browse the repository at this point in the history
  • Loading branch information
tiredofit committed Dec 30, 2019
1 parent c3b099f commit 9000a6c
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 113 deletions.
23 changes: 20 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,28 @@
## 6.6.1 2019-12-30 <dave at tiredofit dot ca>

### Added
- Allow configurable ULIMIT_N environment variable for open file descriptors


## 6.6.0 2019-12-29 <dave at tiredofit dot ca>

### Added
- Update to support new tiredofit/alpine base image


## 6.5.1 2019-12-20 <dave at tiredofit dot ca>

### Added
- Alpine 3.11 Base


## 6.5 2019-08-25 <dave at tiredofit dot ca>

* OpenLDAP 2.4.48
* Alpine 3.10

## 6.4 2019-03-29 <dave at tiredofit dot ca>
## 6.4 2019-06-19 <dave at tiredofit dot ca>

* Repair BASE_DN variable that allows for sub DNs
* Alpine 3.10

## 6.3.2 2019-03-21 <dave at tiredofit dot ca>

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ None.
Automated builds of the image are available on [Registry](https://hub.docker.com/r/tiredofit/openldap) and is the recommended method of installation.

```bash
docker pull tiredofit/openldap
docker pull registry.selfdesign.org/docker/openldap
```

# Quick Start
Expand Down Expand Up @@ -111,7 +111,7 @@ Required and used for new ldap server only:
| `CONFIG_PASS` | Ldap Config password. Default `config` |
| `ORGANIZATION` | Organization Name Default: `Example Organization` |
| `ENABLE_READONLY_USER` | Add a read only user. Default`false` |
| `READONLY_USER_USER` | Read only user username. Default `readonly |
| `READONLY_USER_USER` | Read only user username. Default `readonly` |
| `READONLY_USER_PASS` | Read only user password. Default `readonly` |
| `SCHEMA_TYPE` | Use `nis` or `rfc2307bis` core schema. Default `nis` |

Expand All @@ -120,7 +120,7 @@ Required and used for new ldap server only:
|-----------|-------------|
| `BACKEND` | Ldap backend. `bdb` `hdb` `mdb` and others. Default `mdb` |
| `LOG_LEVEL` | Set LDAP Log Level - Default `256`

| `ULIMIT_N` | Set Open File Descriptor Limit - Default `1024` |

Backup Options:

Expand Down
30 changes: 16 additions & 14 deletions install/etc/cont-init.d/09-nginx
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
#!/usr/bin/with-contenv bash

source /assets/functions/*
PROCESS_NAME="nginx"

### Check to see if Enabled/Disabled
if [ "$ENABLE_NGINX" = "FALSE" ]; then
echo "**** [nginx] Disabling nginx"
s6-svc -d /var/run/s6/services/09-nginx
exit 0
fi
if [ "$ENABLE_NGINX" = "FALSE" ]; then
print_warn "Disabling nginx"
s6-svc -d /var/run/s6/services/09-nginx
exit 0
fi

### Adjust NGINX Runtime Variables
UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:="2G"}
sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf
### Adjust NGINX Runtime Variables
UPLOAD_MAX_SIZE=${UPLOAD_MAX_SIZE:="2G"}
sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf

mkdir -p /www/logs/nginx
chown -R nginx /www/logs/nginx
mkdir -p /tmp/nginx
chown -R nginx /tmp/nginx
mkdir -p /www/logs/nginx
chown -R nginx /www/logs/nginx
mkdir -p /tmp/nginx
chown -R nginx /tmp/nginx

mkdir -p /tmp/state
touch /tmp/state/09-nginx
liftoff
Loading

0 comments on commit 9000a6c

Please sign in to comment.