Commit b50ebf04 authored by Johannes Zellner's avatar Johannes Zellner

Update to manifest v2

parent 5cb1085d
......@@ -13,7 +13,8 @@
"ldap": {},
"sendmail": {}
},
"manifestVersion": 1,
"manifestVersion": 2,
"minBoxVersion": "4.1.5",
"website": "https://github.com/dani-garcia/bitwarden_rs",
"contactEmail": "support@cloudron.io",
"icon": "file://logo.png",
......
......@@ -23,7 +23,7 @@ RUN rm /etc/apache2/sites-enabled/*
RUN sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf
RUN a2disconf other-vhosts-access-log
COPY apache.conf /etc/apache2/sites-enabled/bitwarden.conf
RUN a2enmod ldap authnz_ldap proxy proxy_http proxy_wstunnel rewrite
RUN a2enmod ldap authnz_ldap proxy proxy_http proxy_wstunnel rewrite
# Copies the files from the context (Rocket.toml file and web-vault)
# and the binary from the "build" stage to the current stage
......
......@@ -21,9 +21,9 @@
AuthType Basic
AuthBasicProvider ldap
AuthName "Use your Cloudron admin account to login"
AuthLDAPURL ${LDAP_URL}/${LDAP_USERS_BASE_DN}?username?sub?(memberof=cn=admins,${LDAP_GROUPS_BASE_DN})
AuthLDAPBindDN "${LDAP_BIND_DN}"
AuthLDAPBindPassword "{LDAP_BIND_PASSWORD}"
AuthLDAPURL ${CLOUDRON_LDAP_URL}/${CLOUDRON_LDAP_USERS_BASE_DN}?username?sub?(memberof=cn=admins,${CLOUDRON_LDAP_GROUPS_BASE_DN})
AuthLDAPBindDN "${CLOUDRON_LDAP_BIND_DN}"
AuthLDAPBindPassword "{CLOUDRON_LDAP_BIND_PASSWORD}"
Require valid-user
Satisfy any
......
......@@ -2,14 +2,14 @@
set -eu
export DOMAIN=$APP_ORIGIN
export SMTP_HOST=$MAIL_SMTP_SERVER
export SMTP_FROM=$MAIL_FROM
export DOMAIN=$CLOUDRON_APP_ORIGIN
export SMTP_HOST=$CLOUDRON_MAIL_SMTP_SERVER
export SMTP_FROM=$CLOUDRON_MAIL_FROM
export SMTP_FROM_NAME=Bitwarden
export SMTP_PORT=$MAIL_SMTPS_PORT
export SMTP_PORT=$CLOUDRON_MAIL_SMTPS_PORT
export SMTP_SSL=true
export SMTP_USERNAME=$MAIL_SMTP_USERNAME
export SMTP_PASSWORD=$MAIL_SMTP_PASSWORD
export SMTP_USERNAME=$CLOUDRON_MAIL_SMTP_USERNAME
export SMTP_PASSWORD=$CLOUDRON_MAIL_SMTP_PASSWORD
echo "=> Starting apache"
APACHE_CONFDIR="" source /etc/apache2/envvars
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment