From 6eba3ddac22bd7ee9c9f9e07b1e4208447a60ea3 Mon Sep 17 00:00:00 2001 From: KOMATSU Seiji Date: Thu, 23 Feb 2017 04:07:58 +0900 Subject: [PATCH] Fix sharedocsEnv template - Changed LOGIN_PROVIDER to app - Changed UPLOAD_DESTINATION to s3 --- sharedocsEnv-template | 15 ++++++++++----- sharedocsEnv-template.bat | 12 ++++++++++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/sharedocsEnv-template b/sharedocsEnv-template index 355d677..6b52669 100644 --- a/sharedocsEnv-template +++ b/sharedocsEnv-template @@ -1,4 +1,8 @@ -#!/bin/bash +### ------------------------------------------------------------------------------------- +### Sharedocs configuration variables +### +### For more details, see: https://github.com/atware/sharedocs/blob/master/README.md +### ------------------------------------------------------------------------------------- export SITE_NAME=Sharedocs:local export SITE_TITLE=Sharedocs @@ -10,10 +14,12 @@ export DATABASE_PASSWORD="********" export GOOGLE_ANALYTICS_KEY="********" -export LOGIN_PROVIDOR=google +export LOGIN_PROVIDOR=app export LOGIN_PERMITTED_EMAIL_DOMAINS=example.com + export SKINNY_OAUTH2_CLIENT_ID_GOOGLE="*************************" export SKINNY_OAUTH2_CLIENT_SECRET_GOOGLE="***********************" + export LDAP_TYPE="plain" export LDAP_HOST="***" export LDAP_PORT=389 @@ -24,8 +30,7 @@ export LDAP_USER_NAME_ATTRIBUTE=uid export LDAP_MAIL_ADDRESS_ATTRIBUTE=mail export LDAP_KEY_STORE= -export UPLOAD_DESTINATION=s3 - +export UPLOAD_DESTINATION=local export LOCAL_UPLOAD_BASE_DIR="/tmp" export LOCAL_UPLOAD_BASE_URL="/static/uploads" @@ -39,4 +44,4 @@ export EXTERNAL_INTEGRATION_SERVICE=logger export OGP_ALLOW_UA_PREFIXES="UA prefix to allow to access" -#export MARKDOWN_HELP_PAGE_ID=1 \ No newline at end of file +#export MARKDOWN_HELP_PAGE_ID=1 diff --git a/sharedocsEnv-template.bat b/sharedocsEnv-template.bat index f274bc4..7cbcb13 100644 --- a/sharedocsEnv-template.bat +++ b/sharedocsEnv-template.bat @@ -1,5 +1,11 @@ @ECHO OFF +rem ------------------------------------------------------------------------------------- +rem Sharedocs configuration variables +rem +rem For more details, see: https://github.com/atware/sharedocs/blob/master/README.md +rem ------------------------------------------------------------------------------------- + SET SITE_NAME=Sharedocs:local SET SITE_TITLE=Sharedocs @@ -10,10 +16,12 @@ SET DATABASE_PASSWORD=******** SET GOOGLE_ANALYTICS_KEY=******** -SET LOGIN_PROVIDOR=google +SET LOGIN_PROVIDOR=app SET LOGIN_PERMITTED_EMAIL_DOMAINS=example.com + SET SKINNY_OAUTH2_CLIENT_ID_GOOGLE=************************* SET SKINNY_OAUTH2_CLIENT_SECRET_GOOGLE=*********************** + SET LDAP_TYPE=plain SET LDAP_HOST=*** SET LDAP_PORT=389 @@ -39,4 +47,4 @@ SET EXTERNAL_INTEGRATION_SERVICE=logger SET OGP_ALLOW_UA_PREFIXES="UA prefix to allow to access" -rem SET MARKDOWN_HELP_PAGE_ID=1 \ No newline at end of file +rem SET MARKDOWN_HELP_PAGE_ID=1