summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSimon Rettberg2014-10-09 18:07:34 +0200
committerSimon Rettberg2014-10-09 18:07:34 +0200
commitfc332a43f363b66c30613898038f7868a84c822b (patch)
tree325dc9f8aada3a7f27d626f31446cb23bb84e284 /config
parentAdpated to type adaption of contentOperatingSystem. (diff)
downloadsatellite-daemon-fc332a43f363b66c30613898038f7868a84c822b.tar.gz
satellite-daemon-fc332a43f363b66c30613898038f7868a84c822b.tar.xz
satellite-daemon-fc332a43f363b66c30613898038f7868a84c822b.zip
Updated config examples
Diffstat (limited to 'config')
-rw-r--r--config/global.properties.example30
-rw-r--r--config/identity.properties.example8
2 files changed, 15 insertions, 23 deletions
diff --git a/config/global.properties.example b/config/global.properties.example
index ce03b0f..2275e2b 100644
--- a/config/global.properties.example
+++ b/config/global.properties.example
@@ -3,29 +3,13 @@
# hostname of the masterserver
MASTERSERVER_HOST=132.230.4.17
-# type of the keystore???
-KEYSTORE_TYPE=jks
+# the truststore that is used to validate the certificate of the server
+# leave blank to use system's cacert store
+TRUSTSTORE_PATH=/path/to/truststore.jks
-# the keystore that is used for the filetransfer
-FILETRANSFER_KEYSTORE_PATH=/path/to/keystore.jks
-
-# the password of the keystore above
-FILETRANSFER_KEYSTORE_PASSWORD=changeit
-
-# the name of the organization
-ORGANIZATION_NAME=uni-freiburg.de
-
-# the alias of the keystore for the secure thrift connection
-THRIFT_KEYSTORE_ALIAS=alias
-
-# it's password
-THRIFT_KEYSTORE_PASSWORD=changeit
-
-# and it's path
-THRIFT_KEYSTORE_PATH=/path/to/keystore.jks
-
-# port where the thrift connection is opened (usually this is 9191)
-THRIFT_PORT=9191
+# port to which the thrift connection is opened (usually this is 9090)
+THRIFT_PORT=9090
# the image folder where all up- and downloads are saved
-IMAGE_FOLDER=/path/to/images \ No newline at end of file
+IMAGE_FOLDER=/path/to/images
+
diff --git a/config/identity.properties.example b/config/identity.properties.example
new file mode 100644
index 0000000..9f965fa
--- /dev/null
+++ b/config/identity.properties.example
@@ -0,0 +1,8 @@
+# Name of this organization
+ORGANIZATION_NAME=my.university.com
+
+# The keypair for authentication
+MODULUS=123
+PUBLIC_EXPONENT=456
+PRIVATE_EXPONENT=789
+