# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2014-10-17 14:54:19
# Node ID cd9ca2821c24bc0b67c62c3884ed1b191c22b1a8
# Parent  30570d1297b14c63c38dbdcfbcd0c442facdf9af

Allow manual override of fingerprint in update script!

diff --git a/Scripts/update_server.py b/Scripts/update_server.py
--- a/Scripts/update_server.py
+++ b/Scripts/update_server.py
@@ -101,11 +101,16 @@ def get_config():
     return config
 
 
-def create_server_json(tor_configfile='/etc/tor/torrc', name='tor'):
+def create_server_json(tor_configfile='/etc/tor/torrc', name='tor', updater_config=None):
 
     tor_config = read_tor_config(tor_configfile)
     server_type = get_server_type(tor_config)
     hostname, fingerprint = get_tor_fingerprint(name)
+
+    if updater_config is not None:
+        if 'fingerprint' in updater_config['main']:
+            fingerprint = updater_config['main']['fingerprint']
+
     tor_status = get_tor_status(name)
     ip = get_ip(tor_config)
 
@@ -162,11 +167,10 @@ def main():
             response = update_server(server_json, ennstatus_url)
             print(response, end='')
     else:
-        server_json = create_server_json()
+        server_json = create_server_json(updater_config=config)
         response = update_server(server_json, ennstatus_url)
         print(response, end='')
 
 
 if __name__ == '__main__':
     main()
-