Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								2f063b28c0 
								
							 
						 
						
							
							
								
								start work on ciscoasa honeypot  
							
							 
							
							
							
						 
						
							2018-02-20 17:40:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ed159349ce 
								
							 
						 
						
							
							
								
								disable netplan, enable ifupdown  
							
							 
							
							
							
						 
						
							2018-02-20 17:09:46 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fffea6d2a2 
								
							 
						 
						
							
							
								
								Update tpot.seed  
							
							 
							
							
							
						 
						
							2018-02-19 17:14:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								50fab2207c 
								
							 
						 
						
							
							
								
								prepare for wetty docker image  
							
							 
							
							
							
						 
						
							2018-02-19 16:47:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								76dc360641 
								
							 
						 
						
							
							
								
								prepare installer for nginx image  
							
							 
							
							
							
						 
						
							2018-02-16 15:42:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ef5fc21a56 
								
							 
						 
						
							
							
								
								clean up nginx deps from host folder  
							
							 
							
							
							
						 
						
							2018-02-16 15:22:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								46c92047cb 
								
							 
						 
						
							
							
								
								prepare for nginx docker image  
							
							 
							
							
							
						 
						
							2018-02-16 15:17:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8e76d4c909 
								
							 
						 
						
							
							
								
								bump versions  
							
							 
							
							
							
						 
						
							2018-02-13 18:10:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								b891feebc0 
								
							 
						 
						
							
							
								
								update issue version  
							
							 
							
							
							
						 
						
							2018-02-13 16:19:21 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								ce21e24a65 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							
							
						 
						
							2018-02-13 15:08:16 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								467fb4e9f8 
								
							 
						 
						
							
							
								
								disable netplan  
							
							 
							
							
							
						 
						
							2018-02-13 14:57:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								4a52d35a7c 
								
							 
						 
						
							
							
								
								update image url  
							
							 
							
							
							
						 
						
							2018-02-13 14:52:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								c8bcc8c611 
								
							 
						 
						
							
							
								
								adjust path for docker-compose  
							
							 
							
							
							
						 
						
							2018-02-13 12:19:04 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								aa12139d8d 
								
							 
						 
						
							
							
								
								adjust path for docker-compose  
							
							 
							
							
							
						 
						
							2018-02-13 12:17:50 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								8824f90e22 
								
							 
						 
						
							
							
								
								tweaking  
							
							 
							
							
							
						 
						
							2018-02-13 12:15:58 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								d2f1a27908 
								
							 
						 
						
							
							
								
								update elk stack to 5.6.5  
							
							 
							
							
							
						 
						
							2018-01-15 13:34:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								c28dfa6bc7 
								
							 
						 
						
							
							
								
								update elk stack to 5.6.5  
							
							 
							
							
							
						 
						
							2018-01-15 13:33:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
							
							
								
							
							
								44731a54bf 
								
							 
						 
						
							
							
								
								add py-requests  
							
							 
							
							... 
							
							
							
							per request issue #165  
							
						 
						
							2018-01-15 13:13:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marco Ochse 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								57aba69cb7 
								
							 
						 
						
							
							
								
								Solves issue  #130  
							
							 
							
							
							
						 
						
							2018-01-12 17:43:26 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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