Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								90d88008ee 
								
							 
						 
						
							
							
								
								Merge pull request  #164  from dtag-dev-sec/autoinstall-compatible  
							
							 
							
							... 
							
							
							
							LGTM, good catch! 
							
						 
						
							2018-01-12 17:20:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									André Vorbach 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								db8a37a94d 
								
							 
						 
						
							
							
								
								make it compatible with autoinstaller  
							
							 
							
							... 
							
							
							
							t-pot autoinstaller cannot rely on /home/tsec, root directory is suggested. 
							
						 
						
							2018-01-12 15:01:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								f767c829e4 
								
							 
						 
						
							
							
								
								tweak update script  
							
							 
							
							
							
						 
						
							2018-01-10 17:29:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								00dfa6e797 
								
							 
						 
						
							
							
								
								tweak update script  
							
							 
							
							
							
						 
						
							2018-01-10 17:14:39 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ae89b71bd7 
								
							 
						 
						
							
							
								
								tweak update script  
							
							 
							
							
							
						 
						
							2018-01-10 17:13:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a995358d21 
								
							 
						 
						
							
							
								
								finetuning dionaea config  
							
							 
							
							
							
						 
						
							2018-01-10 15:22:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ac168f71cf 
								
							 
						 
						
							
							
								
								Fixes   #142  
							
							 
							
							
							
						 
						
							2017-11-23 17:08:19 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78feb12d5a 
								
							 
						 
						
							
							
								
								Update config for Mailoney, RDPY, VNClowpot  
							
							 
							
							
							
						 
						
							2017-11-17 15:29:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4af1f8d57f 
								
							 
						 
						
							
							
								
								AWS and OTC do not permit rx off / tx off  
							
							 
							
							... 
							
							
							
							To ensure compatability with dtag-dev-sec/t-pot-autoinstall and AWS / OTC `tpot.service` no longer expects successful execution of disabling offloading. 
							
						 
						
							2017-11-17 14:59:14 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								9a23e1010a 
								
							 
						 
						
							
							
								
								Ubuntu introduced major update for docker  
							
							 
							
							... 
							
							
							
							Today Ubuntu introduced a major upgrade for docker, which requires a
version bump for docker-compose files used in T-Pot. 
							
						 
						
							2017-11-16 17:50:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a370ae5f41 
								
							 
						 
						
							
							
								
								Include video  
							
							 
							
							
							
						 
						
							2017-11-06 17:02:03 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57492266ca 
								
							 
						 
						
							
							
								
								Update README.md  
							
							 
							
							
							
						 
						
							2017-11-06 16:33:09 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a2783a048b 
								
							 
						 
						
							
							
								
								Update CONTRIBUTING.MD  
							
							 
							
							
							
						 
						
							2017-10-31 15:37:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b0b555ae7a 
								
							 
						 
						
							
							
								
								remove beta label  
							
							 
							
							
							
						 
						
							2017-10-23 18:18:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								f2f2fcdd57 
								
							 
						 
						
							
							
								
								update documentation  
							
							 
							
							
							
						 
						
							2017-10-23 15:08:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								fb37cb6152 
								
							 
						 
						
							
							
								
								Continue cleaning up and update documentation  
							
							 
							
							
							
						 
						
							2017-10-23 14:56:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								50d1c212ad 
								
							 
						 
						
							
							
								
								Continue cleaning up  
							
							 
							
							
							
						 
						
							2017-10-23 13:10:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								46264774b3 
								
							 
						 
						
							
							
								
								Start cleaning up and update documentation  
							
							 
							
							
							
						 
						
							2017-10-23 13:02:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								70f75d51ee 
								
							 
						 
						
							
							
								
								remove listbot sources  
							
							 
							
							
							
						 
						
							2017-10-21 16:32:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								f2880ec3d6 
								
							 
						 
						
							
							
								
								refine ip matching  
							
							 
							
							... 
							
							
							
							fix regex to only match IPs at the beginning of a line 
							
						 
						
							2017-10-21 16:00:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								b71f2f67f4 
								
							 
						 
						
							
							
								
								Cleanup and prep for Beta  
							
							 
							
							... 
							
							
							
							- remove some files from merge
- prepare for beta 
							
						 
						
							2017-10-19 11:02:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a15d79780d 
								
							 
						 
						
							
							
								
								Merge branch '17.06'  
							
							 
							
							
							
						 
						
							2017-10-19 08:47:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								7c495250b4 
								
							 
						 
						
							
							
								
								fix merge  
							
							 
							
							
							
						 
						
							2017-10-19 08:47:01 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a1a2dd370b 
								
							 
						 
						
							
							
								
								fix path issue  
							
							 
							
							
							
						 
						
							2017-10-17 11:03:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								09a5f4bec0 
								
							 
						 
						
							
							
								
								improve update script  
							
							 
							
							
							
						 
						
							2017-10-13 21:53:21 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								7d96e4f210 
								
							 
						 
						
							
							
								
								add env vars for ewsposter in docker-compose configs  
							
							 
							
							
							
						 
						
							2017-10-13 21:41:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8e3967f2e1 
								
							 
						 
						
							
							
								
								disable netdata version check  
							
							 
							
							
							
						 
						
							2017-10-13 21:25:11 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b6e62e8e77 
								
							 
						 
						
							
							
								
								Merge pull request  #137  from dtag-dev-sec/docker  
							
							 
							
							... 
							
							
							
							Include T-Pot Docker Repos 
							
						 
						
							2017-10-13 23:05:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								c2c76459a1 
								
							 
						 
						
							
							
								
								fix rdpy dep  
							
							 
							
							
							
						 
						
							2017-10-13 20:41:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								0d5d80b1e3 
								
							 
						 
						
							
							
								
								include docker repos  
							
							 
							
							... 
							
							
							
							... skip emobility since it is a dev repo 
							
						 
						
							2017-10-13 18:58:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								f1ada16414 
								
							 
						 
						
							
							
								
								update paths, include update feature  
							
							 
							
							
							
						 
						
							2017-10-06 12:09:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								d6b4d96142 
								
							 
						 
						
							
							
								
								update installer for 17.06 branch  
							
							 
							
							
							
						 
						
							2017-10-05 23:22:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b56ed67dd0 
								
							 
						 
						
							
							
								
								Merge pull request  #134  from dtag-dev-sec/autoupdate  
							
							 
							
							... 
							
							
							
							Add Update Feature 
							
						 
						
							2017-10-06 01:05:59 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								a584d9869e 
								
							 
						 
						
							
							
								
								prepare for merge  
							
							 
							
							... 
							
							
							
							autoupdate is functional as far as the test branch can tell 
							
						 
						
							2017-10-05 22:53:35 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9ec38852ae 
								
							 
						 
						
							
							
								
								test 2  
							
							 
							
							
							
						 
						
							2017-10-05 22:46:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b2ba5f1ea7 
								
							 
						 
						
							
							
								
								test 1  
							
							 
							
							
							
						 
						
							2017-10-05 22:41:57 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef39d1af6 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2017-10-05 22:40:31 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8159e98e72 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 22:34:41 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								4409f9bca0 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 22:02:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								3f444ef22f 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 21:02:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7a0fdf4c 
								
							 
						 
						
							
							
								
								tweaking and testing  
							
							 
							
							
							
						 
						
							2017-10-05 19:13:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								dbaccf18f0 
								
							 
						 
						
							
							
								
								start with update script and some testing  
							
							 
							
							
							
						 
						
							2017-09-28 20:00:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								65c7d9cc88 
								
							 
						 
						
							
							
								
								check valid ipv4  
							
							 
							
							
							
						 
						
							2017-09-28 13:30:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								e5e8ad4785 
								
							 
						 
						
							
							
								
								fix typo  
							
							 
							
							
							
						 
						
							2017-09-26 17:56:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								7b228c5be0 
								
							 
						 
						
							
							
								
								some cleanup  
							
							 
							
							
							
						 
						
							2017-09-26 15:18:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								1347eac88f 
								
							 
						 
						
							
							
								
								update scripts to new file layout  
							
							 
							
							... 
							
							
							
							iso will not include tpot repo
tpot repo will be cloned during install as all the other tools 
							
						 
						
							2017-09-26 15:15:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b5a4ef948f 
								
							 
						 
						
							
							
								
								play with layout  
							
							 
							
							
							
						 
						
							2017-09-25 21:08:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								65bb8d30b4 
								
							 
						 
						
							
							
								
								Update README.md  
							
							 
							
							
							
						 
						
							2017-09-22 12:18:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								8cb6457882 
								
							 
						 
						
							
							
								
								rename webs to correct name webtty  
							
							 
							
							
							
						 
						
							2017-09-20 15:12:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									t3chn0m4g3 
								
							 
						 
						
							
							
							
							
								
							
							
								ed563f3d90 
								
							 
						 
						
							
							
								
								update readme  
							
							 
							
							
							
						 
						
							2017-09-20 14:02:17 +02:00