Commit graph

305 commits

Author SHA1 Message Date
Marco Ochse
01d4ef2928 account for unresolved external ip address 2017-07-21 15:26:37 +00:00
Marco Ochse
07c3f48894 compress and rotate logs if persistence enabled
if persistence is enabled, log files, downloads, binaries, etc. will be compressed and rotated
each start / stop of the t-pot service will account for a full rotation cycle if files are not empty
basically the rotation will recycle logs after 30 days, unless the service is stopped / started manually which will cause for a shorter period
2017-07-20 20:25:49 +00:00
Marco Ochse
c8c3124f04 tweaking 2017-07-12 18:53:20 +00:00
Marco Ochse
022a48f1b8 tweaking 2017-07-12 18:51:20 +00:00
Marco Ochse
9e880d14ed test backport fix for hostname 2017-06-29 08:04:49 +00:00
Marco Ochse
6549f8f582 nsa gen is no more, offline alternative 2017-06-21 22:46:12 +00:00
Marco Ochse
51e8dc1aca fix path 2017-06-21 19:34:08 +00:00
Marco Ochse
0e7563da17 prepare for honeypot changes 2017-06-21 19:26:42 +00:00
Marco Ochse
77e68f0e64 tweaking, add new honeypot
correct a typo in CONTRIBUTING.MD
preapre for and add mailoney honeypot
2017-06-15 22:08:56 +00:00
Marco Ochse
a1bc127698 consider commented config lines 2017-06-07 16:24:42 +00:00
Marco Ochse
66cdb0e60a modifications for conpot update 2017-06-07 15:51:42 +00:00
Marco Ochse
4e6f4fc9e8 finetuning
add p0f
change some defaults
2017-06-06 22:32:49 +00:00
Marco Ochse
48d36f999d finetuning suricata 2017-06-03 23:56:10 +00:00
Marco Ochse
aea18d5f92 squashing some bugs
do not forward tcp connections to or from 127.0.0.1 to NFQ (fixes strange netdata behaviour)
run netdata on network mode host again (update compose files) including host metrics
2017-05-30 19:07:43 +00:00
Marco Ochse
5d8ad0a623 add spiderfoot persistence 2017-05-25 21:59:26 +00:00
Marco Ochse
2bbafbc791 handle iptables differently 2017-05-23 23:32:07 +00:00
Marco Ochse
345df08941 improvements
use docker-compose from pypi with support for 2.1 compose file version
logstash, kibana, head & netdata are now depending on a healthy elasticsearch container before starting
remove alerta-cli
tweak installer
2017-05-22 19:36:41 +00:00
Marco Ochse
931ac2dd85 tweaking
update dps.sh
adjust docker-compose related tpot configs for dionaea (stdin_open: true)
adjust tpot.service (suritcata / p0f prep) to be aware of a situation without local network route ( Fixes#99 )
2017-05-11 17:01:21 +00:00
Marco Ochse
ce0e42e555 get latest ctop 2017-05-04 22:52:32 +00:00
Marco Ochse
b36c63962d tweaking, prepare for elk microservice 2017-05-03 20:55:18 +00:00
Marco Ochse
3de02ee7b0 tweaking for docker-compose
get rid of self-check scripts, docker-compose takes care of that now
use tpot.yml config for tpot scripts
wipe crontab clean of legacy scripts
check.lock no longer needed (rc.local)
adjust installer (invisible cursor, get image info from tpot.yml, some tweaking)
2017-05-01 19:03:27 +00:00
Marco Ochse
365e1a1e5c prepare switch to docker-compose 2017-04-30 23:34:30 +00:00
Marco Ochse
291034d53e feed newlines when patching sshd config 2017-04-26 20:01:15 +02:00
Marco Ochse
dc30cd81c2 fix token for everything installation 2017-04-24 17:21:45 +02:00
Marco Ochse
0d684cc825 add pypi to list of internet checks 2017-04-24 16:57:58 +02:00
Marco Ochse
843ba30762 final touches on installer
move tsec password dialog from debian installer to t-pot-installer
check for secure password for tsec and web user
fix layout issue
2017-04-24 16:06:23 +02:00
Marco Ochse
50a93f5abf neatify two installer widgets 2017-04-22 20:05:12 +02:00
Marco Ochse
66dd2398e8 cleanup and prettyfy installer
reorganized installer
now using dialog throughout the whole installation
2017-04-21 01:11:10 +02:00
Marco Ochse
8417ed2fbd fix path 2017-04-19 15:48:27 +02:00
Marco Ochse
845a11e240 fix path 2017-04-19 15:39:34 +02:00
Marco Ochse
9fea0461fc Clean up, add Spiderfoot
tpot configs are now stored in /etc/tpot/
tpot related scripts are now stored /usr/share/tpot/bin
some scripts are improved
some scripts are cleaned of old comments
spiderfoot is now part of tpot
2017-04-19 12:22:51 +00:00
Marco Ochse
62ce12a8a9 disable logging for installer
1. improve performance
2. improve convenience, user sees progress
3. infos and errors are displayed
2017-04-17 00:53:47 +02:00
Marco Ochse
5b267b396f improve installer 2017-04-16 23:44:19 +02:00
Marco Ochse
c9827f0f03 manage kibana objetcs, ES dump and restore, ES folder backup 2017-04-14 22:08:35 +00:00
Marco Ochse
90592e7388 manage kibana objetcs, dump and restore 2017-04-12 20:46:12 +00:00
Marco Ochse
d54702ece8 include updates 2017-04-10 20:38:22 +00:00
Marco Ochse
1453e26f76 prepare for forward logs to cc 2017-04-07 15:20:56 +00:00
Marco Ochse
ff4a87ff42 set linux as term 2017-03-22 18:42:24 +00:00
Marco Ochse
9090b5cfd7 installer ui improvements 2017-03-22 18:27:43 +00:00
Marco Ochse
052a3489e9 fix typo 2017-03-17 23:49:29 +00:00
Marco Ochse
ffc0edd587 prepare for elk 5.x and improvements 2017-03-17 23:47:04 +00:00
Marco Ochse
a94b34c8a8 add some colors 2017-03-15 09:28:12 +00:00
Marco Ochse
71e1069dbe fix 2017-03-13 22:17:02 +00:00
Marco Ochse
412c7fa508 fix 2017-03-13 21:58:48 +00:00
Marco Ochse
fcbb2952d3 fixes and improvements 2017-03-13 21:19:28 +00:00
Marco Ochse
a556a193f7 fix netdata error 2017-03-13 19:44:02 +00:00
Marco Ochse
d3599bcc10 update ui-for-docker systemd 2017-03-13 16:29:51 +00:00
Marco Ochse
fddfc68ff3 improvements 2017-03-13 16:10:37 +00:00
Marco Ochse
ff75c6c588 modify installer for 17.06 2017-03-13 10:07:46 +00:00
Marco Ochse
a98e6bfc53 prepare for 17.06 dev env 2017-03-13 00:38:43 +00:00
Marco Ochse
4a67a47a04 remove some services from myip.sh 2017-03-12 23:50:27 +00:00
Marco Ochse
4a58f7488a fix bug myip.sh 2017-03-12 23:46:12 +00:00
Marco Ochse
c5de828d7e prepare for new ewsposter 2017-03-12 23:31:34 +00:00
Marco Ochse
fb02d41e57 add latest ctop 2017-03-12 20:57:56 +00:00
Marco Ochse
35700a731b update /etc/issue 2017-03-12 12:05:22 +00:00
Marco Ochse
26a9357d84 modify elk service 2017-03-08 17:06:13 +00:00
Marco Ochse
fab294bdda remove patching docker defaults
handled in systemd scripts for each container
2017-03-04 21:24:50 +01:00
Marco Ochse
9fbdcf80f5 add working solution for head 2017-02-27 17:42:34 +00:00
Marco Ochse
6298afae4a Update install.sh 2017-02-26 12:29:38 +01:00
Marco Ochse
20759a7c5c starting with elk5 2017-02-26 11:22:56 +00:00
Marco Ochse
4c3b6e819c Update ews.cfg 2017-02-24 12:20:08 +01:00
Marco Ochse
1175541d5c add conpot support 2017-02-22 20:21:56 +01:00
t3chn0m4g3
7036a7fc77 include a better solution to fetch external ip 2017-02-22 15:04:48 +00:00
Marco Ochse
3099f6f3f3 Fix broken proxy support by using curl with different IP service
... leaving comment for DNS variant
2017-02-22 15:21:10 +01:00
Marco Ochse
5f12ea7543 fix problem with ext ip resolving 2017-02-15 14:26:28 +01:00
Marco Ochse
41a3b610eb improve wlan example config 2016-12-06 13:18:00 +01:00
Marco Ochse
aecb9380f2 fix docker proxy issue
starting with systemd docker only sources /etc/default/docker which means for proxy to work the export commands need to be removed.
2016-12-06 10:44:04 +01:00
Marco Ochse
d1b85a497d fix namegen issue when using a proxy 2016-12-06 09:55:41 +01:00
Marco Ochse
fca1b3fd37 switch to docker.io
improve proxy support
2016-12-03 21:47:53 +01:00
Marco Ochse
fb71d49a56 fix proxy issue with wetty install
fixes #63
2016-11-29 18:03:49 +01:00
Marco Ochse
8d55eed8e5 fix grep for untagged images 2016-11-09 17:51:58 +01:00
t3chn0m4g3
6d7608d112 tweaking, fixing
lift resolution constraints (keep autodetect from kernel fb)
thanks to @sunshine112 reporting issue #62 - the reason why the install fails is due to the fact that the latest kernel is very picky about a clean unmount of the used block device. the block device will now be unmounted cleanly as soon as the write operation of the ISO Maker is finished writing the image to the USB drive.
2016-10-28 15:08:55 +02:00
t3chn0m4g3
72a9105db5 fix permissions after merge 2016-10-28 10:51:14 +02:00
t3chn0m4g3
a4f1af68a5 fix merge 2016-10-27 16:47:58 +00:00
t3chn0m4g3
574739b0fe fix typo in dashboard, improve readability of installer 2016-10-27 15:23:43 +00:00
t3chn0m4g3
091025fcfb fix bugs, issues
fix an issue with nginx upgrades where index.html was overwritten without asking
fix an issue with dashboards where positions were mixed up after removing welcome message and saving as default
2016-10-27 11:11:51 +00:00
t3chn0m4g3
974eea9a7e fix bug in fuECHO, improve readability of installation menu 2016-10-26 01:21:42 +02:00
t3chn0m4g3
be12a24c2f tested and final: include installation type into installer...
it is finally possible to go without the ISO maker if you just want to try out a different T-Pot edition.
2016-10-25 23:33:20 +02:00
Marco Ochse
6f992604b8 experimental: include installation type into installer... 2016-10-25 18:35:39 +02:00
t3chn0m4g3
4cbe7842a8 tweaking lookup url fields 2016-10-23 18:16:30 +00:00
t3chn0m4g3
8aea1914bb add grace period after docker restart 2016-10-23 15:34:11 +02:00
t3chn0m4g3
1316834c9b include dashboard for rc 2016-10-23 12:59:06 +00:00
t3chn0m4g3
40c2b2c386 fix bugs, prepare for rc 2016-10-23 14:54:57 +02:00
t3chn0m4g3
93b00cb47a tweaking 2016-10-23 13:38:44 +02:00
t3chn0m4g3
c8f2739d11 bring dashboards back, tweaking and prepare for beta 2016-10-23 10:34:08 +00:00
t3chn0m4g3
8051e32f95 set kibana as homepage 2016-10-18 08:28:12 +00:00
Marco Ochse
b677a190da update ports 2016-10-17 10:37:40 +02:00
t3chn0m4g3
09da808e6e rename time field 2016-10-12 07:33:44 +00:00
t3chn0m4g3
f4427442e0 rename remote_addr field to src_ip 2016-10-11 12:42:18 +00:00
t3chn0m4g3
52d542a646 enable nginx JSON logging 2016-10-11 12:30:30 +00:00
t3chn0m4g3
e2d86dc0a7 modify systemd configs for dionaea and honeytrap 2016-09-24 16:54:49 +00:00
t3chn0m4g3
c445d82f6e tweaking 2016-09-10 21:10:31 +00:00
t3chn0m4g3
0aa7865e42 tweaking 2016-08-29 23:24:25 +00:00
t3chn0m4g3
0f2f5ff1db add dashboard notification 2016-08-29 19:21:35 +00:00
t3chn0m4g3
154ea080f6 fix bug suricata systemd
ethtool is unable to change interface settings
2016-08-29 19:10:39 +00:00
t3chn0m4g3
173e2c040b cowrie just learned telnet, adjusting systemd configs 2016-08-28 14:09:08 +00:00
t3chn0m4g3
7fe0f23b83 tweaking 2016-08-26 11:54:22 +00:00
Marco Ochse
f5a5478732 account for new es cluster name 2016-08-26 13:28:41 +02:00
t3chn0m4g3
fd14e731d2 account for hostname gen fail 2016-08-22 15:24:48 +00:00
t3chn0m4g3
bd29236c47 tweaking dps.sh 2016-08-15 05:46:57 +00:00