From 19ed8b0567b580419c77880198cca5126b8e14c6 Mon Sep 17 00:00:00 2001 From: pixma Date: Thu, 6 Mar 2014 17:51:41 +0530 Subject: [PATCH 1/4] Fields filled with data --- bottle.pyc | Bin 165671 -> 157191 bytes functions.py | 80 ++++++++++++++++++++++++++++++++ functions.pyc | Bin 469 -> 3958 bytes server.py | 113 ++++++++++++++++++++++++++++++++++++++-------- settings.cfg | 19 ++++---- views/config.tpl | 21 ++++----- views/config.tpl~ | 98 ++++++++++++++++++++++++++++++++++++++++ views/default.tpl | 20 ++++---- views/help.tpl | 14 ++++++ views/login.tpl | 73 ++++++++++++++++-------------- views/menu.tpl | 8 ++-- 11 files changed, 358 insertions(+), 88 deletions(-) create mode 100644 views/config.tpl~ diff --git a/bottle.pyc b/bottle.pyc index 9a5cf05b3bd7054f431d28d119ac750a28c5866e..879b689032c0e567e88c5abbad2bca5ee84c92cb 100644 GIT binary patch delta 8758 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 GAo5?4s~B7W delta 16927 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 diff --git a/functions.py b/functions.py index 55a0374..9438a09 100644 --- a/functions.py +++ b/functions.py @@ -1,3 +1,5 @@ +import commands +import re def sizeof_fmt(num): for x in ['bytes','KB','MB','GB']: @@ -5,3 +7,81 @@ def sizeof_fmt(num): return "%3.1f%s" % (num, x) num /= 1024.0 return "%3.1f%s" % (num, 'TB') + +def getRequiredFieldData( sCommandPlease ): + + yourDataRes = { + 'upTime': getTheUpTimePlease(), + 'curtime': getTheCurTimePlease(), + 'kernel': getTheKernelPlease(), + 'host':getTheHostNamePlease(), + 'totalSpace':getToTalSpacePlease(), + 'freeSpace':getFreeSpacePlease(), + 'usedSpace':getUsedSpacePlease(), + 'ipaddr':getTheIpAddrPlease(), + 'netMask': getTheNetMaskPlease() + }[sCommandPlease] + return yourDataRes + +def getTheUpTimePlease(): + + uptime_fromHere = str(commands.getoutput('uptime') ) ## redirecting o/p channel and taking directly in from here. + varForNow = re.search(r"([0-9]+:[0-9]+:[0-9]+)\s+..\s+([0-9]+:[0-9]+(min)?)", uptime_fromHere) + + return varForNow.group(2) + +def getTheCurTimePlease(): + + uptime_fromHere = str(commands.getoutput('uptime') ) ## redirecting o/p channel and taking directly in from here. + varForNow = re.search(r"([0-9]+:[0-9]+:[0-9]+)\s+..\s+([0-9]+:[0-9]+(min)?)", uptime_fromHere) + + return varForNow.group(1)#time + +def getTheKernelPlease(): + + Data_fromHere = str(commands.getoutput('uname -a')) + varForNow = re.search(r"(\w+)\s+(\w+)\s+(\w+.\w+.\w+-\w+-\w+\w+?)", Data_fromHere) + + return varForNow.group(3) + +def getTheHostNamePlease(): + Data_fromHere = str(commands.getoutput('uname -a')) + varForNow = re.search(r"(\w+)\s+(\w+)\s+(\w+.\w+.\w+-\w+-\w+\w+?)", Data_fromHere) + + return varForNow.group(2) + +def getToTalSpacePlease(): + + varData_Temp = str(commands.getoutput('df -h ./ | grep /sda')) # this will give a single line output as it is been requested for the current path. + varForNow = re.search (r"(([0-9]+)\w+)\s+(([0-9]+)\w+)\s+(([0-9]+)\w+)",varData_Temp) + + return varForNow.group(1) + +def getFreeSpacePlease(): + varData_Temp = str(commands.getoutput('df -h ./ | grep /sda')) # this will give a single line output as it is been requested for the current path. + varForNow = re.search (r"(([0-9]+)\w+)\s+(([0-9]+)\w+)\s+(([0-9]+)\w+)",varData_Temp) + + return varForNow.group(5) + +def getUsedSpacePlease(): + + varData_Temp = str(commands.getoutput('df -h ./ | grep /sda')) # this will give a single line output as it is been requested for the current path. + varForNow = re.search (r"(([0-9]+)\w+)\s+(([0-9]+)\w+)\s+(([0-9]+)\w+)",varData_Temp) + + return varForNow.group(3) + +def getTheIpAddrPlease(): + + varData_Temp = str(commands.getoutput('ifconfig')) + varForNow = re.search(r"(inet\s+addr:(\w+.\w+.\w+.\w+))\s+(Mask:\w+.\w+.\w+.\w+)", varData_Temp) + + return varForNow.group(2) + +def getTheNetMaskPlease(): + + varData_Temp = str(commands.getoutput('ifconfig')) + varForNow = re.search(r"(inet\s+addr:\w+.\w+.\w+.\w+)\s+(Mask:(\w+.\w+.\w+.\w+))", varData_Temp) + + return varForNow.group(3) + + diff --git a/functions.pyc b/functions.pyc index 5c0be9eb13143b053397e4f169897596701613dc..7906186c8649eaac8ef0a6338fded41b17c178ec 100644 GIT binary patch literal 3958 zcmd5?*WH;V z4NAp_@&ouu{3pKf4bHu5JGhZhk~>&)u_kW@ql6J@@W7^Vfya-#;z1+BEvOINm}t zzriT{9O@H2m|%w^Q; z^8)5cl?9Y}-B$GiVhH}hr`dJ@Ikp_y2AX*Y^Xvy6hiDLo%2GE=w;!+4bB7KQZ;tke z;+ul=w3lU!SkQIoP{*Zft#s7dbE2nL=*P4VK}uh>i20kAm;3p^YGZlvyX$hemma=f z@4|=AAGgNfPgB78()If1ou%}Wo%JdYsq*DE12afM%Qy2Z^#hUl0;Uma75I%-&sWj@ zR_J$iV>^y^b=#VT(Q)AS`%$;iNd|2jL<3VF9@r9J8~m!H&XZ1PvwX%bau%Hh=OVrn z)_7rItp^Yk$r8PgXS<467`e2HTVs>~$_UB=Wd-Gca)R21)y^OxDwmUt2U)J63Yu{*lW#ZmQVvc9zKN@~l;u*Q$oD9E% z*qZ)i{CJ*dXB6o4Je%W)r``9*p-;OJyJL z_<6Vvq9nfUTi?^>)kQVBZBIW^7~K=&0-&I_3Z7;-aC>Dag6w51OwgSLTYzJ!6& zAhBJfD1;_Iq#Fdbi&EioGQMynVKD|Z1HxnBu$0HbVX>I&a8w_Dw(`y6<+Z6p?U7lo z*I}l6t6?yx-K+(ibyb#%q@J-cgbE3!3>py_gc2oom{>{eI2ESRe%$U!_IKkb8K(4K z!nMhe1A5YlqwtQ#Xx8X2e!LmQ&1nCX+4tVSbZ?^>4w~Gn&SiJjyn65Q{AXp9OP4U} zy$9sI&!)oW12!MB`3Ob`^FHR&B|b$<%^7Q*$4SadoFg%YwUG>v=#>@U)Hvct`^&7b z{~qh`aa$QR93V8-{7GrC{95Cbny6?-9C7Vnre9NzCdqgb>3o9wm=P^p(Haw4ob$*j z!)vHcWu;fCH!6pfZmfruhEcv*K}U5|oNCaD$m##igVSV~En|9=A5qhe4u>?)@H z3hg|VG(*aGmv++Z^FGDk8PRkNQ{9-*^x7-yG(~EbG`$6i)+aQb%S%n(>p`a-4LU*B ze2vAb0rrHb-MmFy;{rY|+l>=- delta 214 zcmew+ca_') def server_static(filepath): - return static_file(filepath, root= 'media/') + return static_file(filepath, root= 'media/') @server.route('/') def default() : - files = os.listdir('dump/') - return template('default',files=files) + + files = os.listdir('dump/') + + + CurTime = getRequiredFieldData('curtime') + upSysTime = getRequiredFieldData( 'upTime' ) + CurTime = 'Time : %s Hrs' %CurTime + upSysTime = "UpTime :%s"%upSysTime + + if( re.search('min', upSysTime) == None ): + upSysTime+= ' Hrs' + + hostName = getRequiredFieldData( 'host' ) + kernelVersionValue = getRequiredFieldData( 'kernel') + + ipAddressEth0 = getRequiredFieldData( 'ipaddr' ) + netMaskAddr = getRequiredFieldData( 'netMask' ) + + nSizeofCurDisk = getRequiredFieldData( 'totalSpace' ) + nSizeUsed = getRequiredFieldData( 'usedSpace' ) + nSizeNotUsed = getRequiredFieldData( 'freeSpace' ) + + nSizeofCurDisk+="B" + nSizeUsed+="B" + nSizeNotUsed+="B" + + return template('default',files=files, upTime=upSysTime, nowTime= CurTime, kerVer=kernelVersionValue, hostNameIs = hostName , ipAddrEth0 = ipAddressEth0,\ + totalNetSpace = nSizeofCurDisk, notUsed = nSizeNotUsed, usedSpace = nSizeUsed , netMaskField = netMaskAddr ) + + @server.route('/download/') def download(filename) : - # IPC to write + # IPC to write - return static_file(filename, root= 'dump/', download=filename) + return static_file(filename, root= 'dump/', download=filename) @server.route('/truncate/') def truncate(filename) : - # Truncate file - tfile = open('dump/'+filename,"wb") - tfile.write("") - tfile.close() - redirect('/') + # Truncate file + tfile = open('dump/'+filename,"wb") + tfile.write("") + tfile.close() + redirect('/') @server.route('/help') def help() : - return template('help') + return template('help') @server.route('/config') def config() : - return template('config') + return template('config') -@server.route('/config', method='POST') +@server.route('/config', method="POST") def save_config() : - rediret('/') - - + # settings to save, code goes here + #redirect('/') to redirect to main page + # below code can be optimized by looping, although three ports are fixed and not going to change, hence kpt the code static + + configParsingInst = ConfigParser.ConfigParser() + devName = request.forms.get('serialPortDeviceName') + devNameTwo = request.forms.get('USBOnePortDeviceName') + devNameThree = request.forms.get('USBTwoPortDeviceName') + + configParsingInst.add_section('gps1') + configParsingInst.set('gps1', 'Device',devName ) + configParsingInst.set('gps1', 'Baud Rate', request.forms.get('serialPortDevBaudRate')) + + configParsingInst.add_section('gps2') + configParsingInst.set('gps2', 'Device', devNameTwo) + configParsingInst.set('gps2', 'Baud Rate', request.forms.get('USBOnePortDevBaudRate')) + + configParsingInst.add_section('gps3') + configParsingInst.set('gps3', 'Device', devNameThree) + configParsingInst.set('gps3', 'Baud Rate', request.forms.get('USBTwoPortDevBaudRate')) + + with open("settings.cfg",'w') as cfgConfigFile: + # now it overwrite the configuration file each time. change the mode for append mode please. + configParsingInst.write( cfgConfigFile ) + cfgConfigFile.close() + + returnPage = """ + + """ + return returnPage ''' simple user login for future ''' @server.route('/login') def login(): - return template('login') + return template('login') @server.route('/login', method='POST') def do_login(): - return template('login') + return template('login') -run(server,reloader=True,host='localhost',port='8080',debug = True) \ No newline at end of file +run(server,reloader=True,host='localhost',port='8088',debug = True) diff --git a/settings.cfg b/settings.cfg index 34b74b1..42ab4ad 100644 --- a/settings.cfg +++ b/settings.cfg @@ -1,11 +1,12 @@ -[serial] -device : /dev/pts/4 -baudrate : 115200 +[gps1] +device = AnnimDev +baud rate = 34543534 -[serial1] -device : /dev/pts/6 -baudrate : 115200 +[gps2] +device = dev2 +baud rate = 234324 + +[gps3] +device = dev3 +baud rate = 56544 -[serial2] -device : /dev/pts/8 -baudrate : 115200 diff --git a/views/config.tpl b/views/config.tpl index df6f587..9b480e2 100644 --- a/views/config.tpl +++ b/views/config.tpl @@ -5,8 +5,7 @@

Raspi Logger Downloader

-
- +
@@ -18,17 +17,17 @@
- +
- +
- +
@@ -46,17 +45,17 @@
- +
- +
- +
@@ -74,17 +73,17 @@
- +
- +
- +
diff --git a/views/config.tpl~ b/views/config.tpl~ new file mode 100644 index 0000000..f019d1d --- /dev/null +++ b/views/config.tpl~ @@ -0,0 +1,98 @@ +% include('header.tpl') +
+
+ % include('menu.tpl') +

Raspi Logger Downloader

+
+ + + +
+
+

Serial Port

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+

USB Port 1

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+

USB Port 2

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + + + + +
+% include('footer.tpl') diff --git a/views/default.tpl b/views/default.tpl index 49993b2..59ef68d 100644 --- a/views/default.tpl +++ b/views/default.tpl @@ -11,8 +11,6 @@
- -
@@ -24,17 +22,17 @@ - Uptime : + {{upTime}} - Time : + {{nowTime}} - Kernel : + Kernel : {{kerVer}} @@ -49,13 +47,13 @@ - Hostname : + Hostname : {{hostNameIs}} - IP : + IP : {{ipAddrEth0}} - NetMask : + Netmask : {{netMaskField}} @@ -68,13 +66,13 @@ - Total : + Total :{{totalNetSpace}} - Free : + Free : {{notUsed}} - + Used : {{usedSpace}} diff --git a/views/help.tpl b/views/help.tpl index e69de29..acd3972 100644 --- a/views/help.tpl +++ b/views/help.tpl @@ -0,0 +1,14 @@ +% include('header.tpl') +
+
+ % include('menu.tpl') +

Raspi Logger Downloader

+
+ +
+
+

Help

+
+
+ +
diff --git a/views/login.tpl b/views/login.tpl index e2223e1..dd5a58a 100644 --- a/views/login.tpl +++ b/views/login.tpl @@ -1,36 +1,43 @@ % include('header.tpl')
-
-
-
-
-
- Login -
-
- - -
- -
-
-
- - -
- -
-
-
- -
-
- -
-
-
-
-
-
+
+ % include('menu.tpl') +

Raspi Logger Downloader

+
+ +
+
+
+
+
+ Login +
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+
-% include('footer.tpl') \ No newline at end of file +% include('footer.tpl') diff --git a/views/menu.tpl b/views/menu.tpl index 4f61716..d8af4d0 100644 --- a/views/menu.tpl +++ b/views/menu.tpl @@ -1,5 +1,5 @@ \ No newline at end of file +
  • Home
    • +
  • Config
    • +
  • Help
    • + From 933f5d47ee2b9759e1b743ad991014852f3fcf89 Mon Sep 17 00:00:00 2001 From: pixma Date: Thu, 6 Mar 2014 17:53:51 +0530 Subject: [PATCH 2/4] remove ignore file --- dump/device1.log | 37 ++++++++ dump/gps.log | 217 +++++++++++++++++++++++++++++++++++++++++++++++ dump/gps2.log | 109 ++++++++++++++++++++++++ 3 files changed, 363 insertions(+) create mode 100644 dump/device1.log create mode 100644 dump/gps.log create mode 100644 dump/gps2.log diff --git a/dump/device1.log b/dump/device1.log new file mode 100644 index 0000000..21ebb71 --- /dev/null +++ b/dump/device1.log @@ -0,0 +1,37 @@ +dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/dump/gps.log b/dump/gps.log new file mode 100644 index 0000000..bddc023 --- /dev/null +++ b/dump/gps.log @@ -0,0 +1,217 @@ +dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/dump/gps2.log b/dump/gps2.log new file mode 100644 index 0000000..b8224e1 --- /dev/null +++ b/dump/gps2.log @@ -0,0 +1,109 @@ +dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY-----dfgdfg-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDTSPMc2rY9bjtWLVeCWUsx744cYEEX+LPCjzI2bmfH4vGjdPYU44BS28Ckm9Ei +r/GyyHkCZ1nu4fPqb5+NRN3Q/6QBSi76Y+1yPaYRiOK/vVEdF+xMvyku8YU/fIJgymFJbnulORiV +4ieRnTVNmYz52bHgssnItnXJAEevf8jM5wIDAQABAoGAddflSP2v0XmO/NTTTy+Qoixzvd3t0Hn1 +gRmvLu7LUZCBp+KPcj0lkJFi1CzYK5monEf2PmH4piU+j05s1jVH5cuEi+4I50XbYkfDNz89CFWg +FaOIW0oAmc5C/w9nbD8SMT/qxC5yx1S6TtZ5FXMTF+S8GkB7s5h/6eom8EuxK9ECQQDtEM5CY3Ig +o/Uu5RVgapVezgMUFUma2qIov79oTy6uA/sSfzIy7N9w8coKrKANNExtlJrHPjOuwwbF9d55iBxZ +AkEA5CkEBMjh/mVQBFRBUJOfUQcC4MXz8tsOW4Zaryuyib4V6sft3U/8SO2lchus8BRxOJ/aoQHL +TlbczHouhGILPwJBAOoXnUVLQ+hdXwA2sHwr42HhloKfXrZuTJBmgBD1l8e4IJYsShqlcyLpb7RI +sCc5zHqssoYqswhQhwC2AEEMGckCQHhXZeY8Km8q8syFwDmG04ZCY3M5FdWnUuhVciloq+/ZEehW +8ZBEqvWwWw5XqJysu5c5QXCg6KH2UNmNLFHpALMCQHDKqPG/bkPZC6IFDplbh3hPJdcTfHzrgGmd +g0VwKtdJtKYTzcx8BzKUnFn1WoNR0uQWQf7ATzE62E2HbGHWRdQ= +-----END RSA PRIVATE KEY----- \ No newline at end of file From b6981b709cfbc961783c8cdb9488a885b34a6b05 Mon Sep 17 00:00:00 2001 From: pixma Date: Thu, 6 Mar 2014 17:55:25 +0530 Subject: [PATCH 3/4] remove file --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7f9dca5..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -dump/ \ No newline at end of file From d682f1b2a9e99026b11ff60a7b3722b7367af77d Mon Sep 17 00:00:00 2001 From: pixma Date: Fri, 7 Mar 2014 17:46:20 +0530 Subject: [PATCH 4/4] server and func file updated --- functions.py | 72 ++++++++++++++++-- functions.pyc | Bin 3958 -> 6450 bytes server.py | 49 +++++++----- settings.cfg | 16 ++-- views/config.tpl | 188 ++++++++++++++++++++++------------------------ views/config.tpl~ | 98 ------------------------ 6 files changed, 195 insertions(+), 228 deletions(-) diff --git a/functions.py b/functions.py index 9438a09..60e6de9 100644 --- a/functions.py +++ b/functions.py @@ -1,5 +1,6 @@ import commands import re +import datetime def sizeof_fmt(num): for x in ['bytes','KB','MB','GB']: @@ -25,15 +26,19 @@ def getRequiredFieldData( sCommandPlease ): def getTheUpTimePlease(): - uptime_fromHere = str(commands.getoutput('uptime') ) ## redirecting o/p channel and taking directly in from here. - varForNow = re.search(r"([0-9]+:[0-9]+:[0-9]+)\s+..\s+([0-9]+:[0-9]+(min)?)", uptime_fromHere) - - return varForNow.group(2) + + + uptime_fromHere = str(commands.getoutput('cat /proc/uptime') ) ## redirecting o/p channel and taking directly in from here. + varForTimeNow = re.search( r"[0-9]+", uptime_fromHere) + m, s = divmod(int(varForTimeNow.group()), 60) + h, m = divmod(m, 60) + varForTime = "%d:%d:%d" %(h,m,s) + return varForTime def getTheCurTimePlease(): uptime_fromHere = str(commands.getoutput('uptime') ) ## redirecting o/p channel and taking directly in from here. - varForNow = re.search(r"([0-9]+:[0-9]+:[0-9]+)\s+..\s+([0-9]+:[0-9]+(min)?)", uptime_fromHere) + varForNow = re.search(r"([0-9]+:[0-9]+:[0-9]+)", uptime_fromHere) return varForNow.group(1)#time @@ -84,4 +89,61 @@ def getTheNetMaskPlease(): return varForNow.group(3) +def appendSectionToPage( appendData, section, deviceNm, baudRate , dName, bRate): + + if appendData == 'header': + + return """ + % include('header.tpl') + +
    + +
    + + % include('menu.tpl') + +

    Raspi Logger Downloader

    + +
    + + + +
    """ + + + elif appendData == 'footer': + return """ + + + +
    +% include('footer.tpl')""" + + else: + + dataValTextHtml = """ +
    +
    +

    %s

    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    """ % (section, section, section, dName, section, bRate) + return dataValTextHtml diff --git a/functions.pyc b/functions.pyc index 7906186c8649eaac8ef0a6338fded41b17c178ec..a157ffeaac32fdc367a8c0b43fdcca6809e2aa74 100644 GIT binary patch literal 6450 zcmd5=?Q$Ep6~&SiCCak%;n=Y!X}jT+H8l>!B+h6W4aFq3;y6vhdX{oB9peSUK!LpFc z3|53(VNepX#9&p(RR&jtyux5j$TbF6g}ln(8VS>`UV~u4fADK{96%Cy3F!fneunJT zU#K0#ffLP6F+n`g z8_AJbrFVm0RNVck8?mUGs)Tdfx#e8Lf6N*U%&heRf|4*o{K^X7ge-(|ViQv%ln2T) zDgYH2EdebtDgqT5EdwnxS^-*NR1%xu^foDg)JMX!&|HWt*$pCv_Cj>B)DWiXeU%PW zh(Uzt$J+3OOlgNBzXRLqSjX^Kc~b>FOsV(N9-H z$ZwJ_F^ysMsPn#R*(uq2Yd_=<`av8;{y+}fUqRJToTWRy@jaz4ZdAi*d+O&bNR@mT zs8CYpYc%#PWFnV$R%iapPKTb6T1cG_kTk4}EDa|15-tiu;|uNv1AB?ZBS+5oYmOWi z<^_v@)x2bzLQ4rF%!%iCiYreIj@i$Ll?AGY&mZGLKY7v3i<_^}XbFZ#Ufa@dBJcRd zttV;Rsb>k9ohAXFeN_AG#oeF*s8^6xIh>sEiXOy!YSf1d)(sXx*jz5>u0IX+py z$nlx=o2aN-+P6;K)&p7#nIZ3YK;G{u`vYYzWgk%XM`Y{(UImDCVHp8q7bk?=|4&G4 z8X^Zma%{>Aq=Kz18(;}>YrbBm={!HYyZ&6?oxE?Lj#6!yaQl2cAZ^Uc4;vIY>)6D+ z59xIzo1ODZAL;8(!M5>yXBah~>AX?r*SL7s?7I@Jmm=290yKb%TZq(glx0kBK zt!wFPnn!i$RO_%6HmCnpK9j2%S{~qKY)!i=N)|-f4RpJObeWd4K+5P#GPh-Ipz(re zq6PEIF-^aD%R0*<n=cR|tDW122y?dCWj=yu{kH|Xgal;0JO}7*JT5p$On#PAsrsd{I1KZ(b zGuzQ@8`qr}EmDJQdaRLbjsCsSkVd^SwJ0-6mYbfhlfeBh?)6ma?!iv7O z^3);sMD2{c-8hZhG!E5vnP7P|AQfu;I1PTG$%bVYJIH=4x6696=cOiYLQ73tt4Lh3&`s{#~Kz$3k9xH4_;`Dt|Ly3>wu*-Q(s;-}f2I`uAW41ig zM~!q1q33$rbte>S2RDHURoSJ06)fQh0w)g7D*8paSpg5E*I6N^Ylh@ZSI?GbrQeGs z*q>tz+u39XX?%EwH%G!u_RxvL+ACfA^c>w#ca6~BQ(<#Q9RwZKsN2%qQyB@wJp}{o zHHW534mUPbb_Vi#ILb&%6qZ2o`n!(A*F zk4zL^c<0ZDrdGPP{SNHLk8w8r9AjxdLCUSYRmiUu3-7(}R7nDRg5v^N@kv@7ym>TN z?|sVX1j?gR7d}?-Xt(Ckw$P(Zk4GWBM-i(>ftmLivXfabI_Dtq z&tv%Qqr^a)!Xdy01s+fk03K8j1gB1r5%DOXV5TafBuRR61@0BN|ab4AIyjhTO(h@cNR}?`D58ECTH{0hl%a6 zubs`QdEZ8-Mm=faFp<_KQqpO!vEQmY^0L{Dsa0=!wQ6~{v0t07Hmc%^6}29`e=DX# zCEXoF^k36O4vSs#RxFxAbcf|xc5%}(WyG{Or$rExXneu~vaIB+BNxB*1nH>W$Qr6n zMZxO*-)-cv$=MuT_OTIDGE=VnP9Z~LDeBL@0M|ly$XPAISNrb9D#2vz;o5Uo3 c#B$UDeBQ!wJTf5tZDLbHH@Y$8$L>SF1C~92W&i*H diff --git a/server.py b/server.py index 31a5991..5674360 100644 --- a/server.py +++ b/server.py @@ -27,7 +27,7 @@ def default() : CurTime = getRequiredFieldData('curtime') upSysTime = getRequiredFieldData( 'upTime' ) CurTime = 'Time : %s Hrs' %CurTime - upSysTime = "UpTime :%s"%upSysTime + upSysTime = "UpTime : %s"%upSysTime if( re.search('min', upSysTime) == None ): upSysTime+= ' Hrs' @@ -70,8 +70,29 @@ def help() : @server.route('/config') def config() : + + confile = ConfigParser.ConfigParser() + confile.read('settings.cfg') + + configPage = "" + configPage += appendSectionToPage('header', None, None, None, None, None) + + for nCount, secNm in enumerate(['serial','gps1', 'gps2']): + deviceNameHere = confile.get(secNm, 'device') + baudR = confile.get(secNm, 'baudrate') + configPage += appendSectionToPage(None, secNm, "%s[Device]"%secNm, "%s[Baud]"%secNm, deviceNameHere, baudR) + + + configPage += appendSectionToPage('footer', None, None, None, None,None) + #configPage = configPageHeader + configPageBody + configPageFooter + + with open('./views/config.tpl','w') as tplFile: + tplFile.write(configPage) + tplFile.close() + return template('config') + @server.route('/config', method="POST") def save_config() : # settings to save, code goes here @@ -79,26 +100,16 @@ def save_config() : # below code can be optimized by looping, although three ports are fixed and not going to change, hence kpt the code static configParsingInst = ConfigParser.ConfigParser() - devName = request.forms.get('serialPortDeviceName') - devNameTwo = request.forms.get('USBOnePortDeviceName') - devNameThree = request.forms.get('USBTwoPortDeviceName') + configFile = open("settings.cfg",'w') - configParsingInst.add_section('gps1') - configParsingInst.set('gps1', 'Device',devName ) - configParsingInst.set('gps1', 'Baud Rate', request.forms.get('serialPortDevBaudRate')) + for nCount, secNm in enumerate(['serial','gps1', 'gps2']): + configParsingInst.add_section(secNm) + serialDataList = request.forms.getlist(secNm) + configParsingInst.set(secNm, 'Device',serialDataList[0] ) + configParsingInst.set(secNm, 'baudrate', serialDataList[1]) - configParsingInst.add_section('gps2') - configParsingInst.set('gps2', 'Device', devNameTwo) - configParsingInst.set('gps2', 'Baud Rate', request.forms.get('USBOnePortDevBaudRate')) - - configParsingInst.add_section('gps3') - configParsingInst.set('gps3', 'Device', devNameThree) - configParsingInst.set('gps3', 'Baud Rate', request.forms.get('USBTwoPortDevBaudRate')) - - with open("settings.cfg",'w') as cfgConfigFile: - # now it overwrite the configuration file each time. change the mode for append mode please. - configParsingInst.write( cfgConfigFile ) - cfgConfigFile.close() + configParsingInst.write(configFile) + configFile.close() returnPage = """