From 13505318b1d71de2fa599e53d8d113144f4a0dfd Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Wed, 8 Oct 2014 14:54:52 +0200
Subject: Implemented publishUser(sessionId, UserInfo) in ApiServer. Plus added
 method for inserting user into user database with given UserInfo.

---
 config/global.properties.example | 76 ----------------------------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 config/global.properties.example

(limited to 'config')

diff --git a/config/global.properties.example b/config/global.properties.example
deleted file mode 100644
index 238db02..0000000
--- a/config/global.properties.example
+++ /dev/null
@@ -1,76 +0,0 @@
-# fill in properties and rename to global.properties
-
-#####################
-#	Main			#
-#####################
-
-# the dir where the images are stored
-image_dir=/tmp
-
-#####################
-#	LDAP			#
-#####################
-
-# the port of the LDAP server
-ldap_port=636
-
-# the host address of the LDAP server
-ldap_host=bwservices-test.vm.uni-freiburg.de
-
-# SSL usage
-ldap_ssl=true
-
-# bind query (don't forget to escape \= and use a % for the username replacement
-ldap_bind_query=uid\=%,ou\=users,dc\=bwlehrpool,dc\=uni-freiburg,dc\=de
-
-# search baseDn
-ldap_search_base_dn=ou\=users,dc\=bwlehrpool,dc\=uni-freiburg,dc\=de
-
-# search filter (use a % for the username replacement
-ldap_search_filter=(&(objectclass\=person)(|(uid=%)(cn=%)))
-
-# ldap keystore with public key
-ldap_keystore_path=./config/ldap.jks
-ldap_keystore_password=changeit
-
-#####################
-#	Session 		#
-#####################
-
-# session timeout for users (in seconds)
-session_timeout_user=600
-
-# session timeout for servers (in seconds)
-session_timeout_server=600
-
-#####################
-#	Ssl Socket		#
-#####################
-
-# port that is used for data connection between satellite and master
-ssl_socket_port=56456
-
-# timeout for kicking idling clients (in minutes)
-ssl_socket_timeout=1
-
-# keystore (.jks format)
-ssl_keystore_file=./config/sslsocket.jks
-
-# keystore alias
-ssl_keystore_alias=alias
-
-# keystore password
-ssl_keystore_password=password
-
-# how often should the masterserver request a block
-# from the satellite if the check sum fails
-# until an error is sent
-ssl_socket_transmit_times=20
-
-#####################
-#	CRC Scheduling	#
-#####################
-
-# how often will the crc scheduler check the crc sums of uploading images in seconds
-# minimum of 60 s recommended
-crc_scheduling_interval=60
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522