diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
| -rw-r--r-- | assets/doc/ass.txt (renamed from cholerab/assets/ass.txt) | 0 | ||||
| -rw-r--r-- | assets/doc/lexikon.txt (renamed from cholerab/assets/lexikon.txt) | 0 | ||||
| -rw-r--r-- | assets/doc/structs.nojson (renamed from cholerab/assets/structs.nojson) | 0 | ||||
| -rw-r--r-- | assets/doc/usecases.txt (renamed from cholerab/assets/usecases.txt) | 0 | ||||
| -rw-r--r-- | boot/lighttpd.conf | 12 | ||||
| l--------- | boot/painload.sh | 1 | ||||
| l--------- | boot/retiolum.sh | 1 | ||||
| -rw-r--r-- | cholerab/AGENDA | 4 | ||||
| -rw-r--r-- | cholerab/ENTERPRISE_PATTERN (renamed from cholerab/pattern/README) | 16 | ||||
| -rw-r--r-- | cholerab/bling/krebs_aquarium.svg | 87 | ||||
| -rw-r--r-- | cholerab/bling/krebs_plain.svg | 130 | ||||
| -rw-r--r-- | cholerab/manifest | 5 | ||||
| -rw-r--r-- | evan/Makefile | 9 | ||||
| -rw-r--r-- | god/Eselkalk/README | 3 | ||||
| -rw-r--r-- | god/Eselkalk/index.js (renamed from shack/Eselkalk/index.js) | 0 | ||||
| -rw-r--r-- | god/Monitoring/collectd/collectd.conf (renamed from Monitoring/collectd/collectd.conf) | 0 | ||||
| -rw-r--r-- | god/Monitoring/collectd/supervisor.d/collectd.conf (renamed from Monitoring/collectd/supervisor.d/collectd.conf) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/Makefile (renamed from Monitoring/nagios/Makefile) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/TODO (renamed from Monitoring/nagios/TODO) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/extinfo.cfg (renamed from Monitoring/nagios/conf/extinfo.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/hostgroups_generic.cfg (renamed from Monitoring/nagios/conf/hostgroups_generic.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/krebs_hosts.cfg (renamed from Monitoring/nagios/conf/krebs_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/krebsnet.cfg (renamed from Monitoring/nagios/conf/krebsnet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/localhost.cfg (renamed from Monitoring/nagios/conf/localhost.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/other_hosts.cfg (renamed from Monitoring/nagios/conf/other_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/services.cfg (renamed from Monitoring/nagios/conf/services.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_contacts.cfg (renamed from Monitoring/nagios/conf/shack_contacts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_guests.cfg (renamed from Monitoring/nagios/conf/shack_guests.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shack_infrastructure.cfg (renamed from Monitoring/nagios/conf/shack_infrastructure.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/shacknet.cfg (renamed from Monitoring/nagios/conf/shacknet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/templates.cfg (renamed from Monitoring/nagios/conf/templates.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/timeperiods.cfg (renamed from Monitoring/nagios/conf/timeperiods.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/tinc_hosts.cfg (renamed from Monitoring/nagios/conf/tinc_hosts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/conf/tincnet.cfg (renamed from Monitoring/nagios/conf/tincnet.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png) | bin | 3681 -> 3681 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico (renamed from Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico) | bin | 822 -> 822 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/krebs.png) | bin | 238 -> 238 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/shack.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/shack.png) | bin | 316 -> 316 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2) | bin | 1305 -> 1305 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/tinc.png) | bin | 361 -> 361 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2) | bin | 1047 -> 1047 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png) | bin | 883 -> 883 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png (renamed from Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png) | bin | 5364 -> 5364 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/htpasswd.users (renamed from Monitoring/nagios/htpasswd.users) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check.bat (renamed from Monitoring/nagios/plugins/check.bat) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check.sh (renamed from Monitoring/nagios/plugins/check.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_apt (renamed from Monitoring/nagios/plugins/check_apt) | bin | 106120 -> 106120 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_bgpstate (renamed from Monitoring/nagios/plugins/check_bgpstate) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_breeze (renamed from Monitoring/nagios/plugins/check_breeze) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_btcguild_miner (renamed from Monitoring/nagios/plugins/check_btcguild_miner) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_by_ssh (renamed from Monitoring/nagios/plugins/check_by_ssh) | bin | 46192 -> 46192 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_clamd (renamed from Monitoring/nagios/plugins/check_clamd) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_cluster (renamed from Monitoring/nagios/plugins/check_cluster) | bin | 32072 -> 32072 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_cpu (renamed from Monitoring/nagios/plugins/check_cpu) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dhcp (renamed from Monitoring/nagios/plugins/check_dhcp) | bin | 44816 -> 44816 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dig (renamed from Monitoring/nagios/plugins/check_dig) | bin | 41392 -> 41392 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_disk (renamed from Monitoring/nagios/plugins/check_disk) | bin | 119216 -> 119216 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_disk_smb (renamed from Monitoring/nagios/plugins/check_disk_smb) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dns (renamed from Monitoring/nagios/plugins/check_dns) | bin | 45488 -> 45488 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dummy (renamed from Monitoring/nagios/plugins/check_dummy) | bin | 28968 -> 28968 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_dummy.sh (renamed from Monitoring/nagios/plugins/check_dummy.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_file_age (renamed from Monitoring/nagios/plugins/check_file_age) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_flexlm (renamed from Monitoring/nagios/plugins/check_flexlm) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_fping (renamed from Monitoring/nagios/plugins/check_fping) | bin | 44656 -> 44656 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ftp (renamed from Monitoring/nagios/plugins/check_ftp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_game (renamed from Monitoring/nagios/plugins/check_game) | bin | 36584 -> 36584 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_host (renamed from Monitoring/nagios/plugins/check_host) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_hpjd (renamed from Monitoring/nagios/plugins/check_hpjd) | bin | 41136 -> 41136 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_http (renamed from Monitoring/nagios/plugins/check_http) | bin | 164624 -> 164624 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_icmp (renamed from Monitoring/nagios/plugins/check_icmp) | bin | 49264 -> 49264 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ide_smart (renamed from Monitoring/nagios/plugins/check_ide_smart) | bin | 34536 -> 34536 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ifoperstatus (renamed from Monitoring/nagios/plugins/check_ifoperstatus) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ifstatus (renamed from Monitoring/nagios/plugins/check_ifstatus) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_imap (renamed from Monitoring/nagios/plugins/check_imap) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ircd (renamed from Monitoring/nagios/plugins/check_ircd) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_jabber (renamed from Monitoring/nagios/plugins/check_jabber) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ldap (renamed from Monitoring/nagios/plugins/check_ldap) | bin | 40816 -> 40816 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ldaps (renamed from Monitoring/nagios/plugins/check_ldaps) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_linux_raid (renamed from Monitoring/nagios/plugins/check_linux_raid) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_load (renamed from Monitoring/nagios/plugins/check_load) | bin | 36168 -> 36168 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_log (renamed from Monitoring/nagios/plugins/check_log) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mailq (renamed from Monitoring/nagios/plugins/check_mailq) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mem.pl (renamed from Monitoring/nagios/plugins/check_mem.pl) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mrtg (renamed from Monitoring/nagios/plugins/check_mrtg) | bin | 36264 -> 36264 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mrtgtraf (renamed from Monitoring/nagios/plugins/check_mrtgtraf) | bin | 34440 -> 34440 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mysql (renamed from Monitoring/nagios/plugins/check_mysql) | bin | 45936 -> 45936 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_mysql_query (renamed from Monitoring/nagios/plugins/check_mysql_query) | bin | 44688 -> 44688 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nagios (renamed from Monitoring/nagios/plugins/check_nagios) | bin | 36616 -> 36616 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_nntp (renamed from Monitoring/nagios/plugins/check_nntp) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_nntps (renamed from Monitoring/nagios/plugins/check_nntps) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nt (renamed from Monitoring/nagios/plugins/check_nt) | bin | 48720 -> 48720 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp (renamed from Monitoring/nagios/plugins/check_ntp) | bin | 46288 -> 46288 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp_peer (renamed from Monitoring/nagios/plugins/check_ntp_peer) | bin | 44880 -> 44880 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ntp_time (renamed from Monitoring/nagios/plugins/check_ntp_time) | bin | 42224 -> 42224 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_nwstat (renamed from Monitoring/nagios/plugins/check_nwstat) | bin | 60912 -> 60912 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_oracle (renamed from Monitoring/nagios/plugins/check_oracle) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_overcr (renamed from Monitoring/nagios/plugins/check_overcr) | bin | 40400 -> 40400 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_pgsql (renamed from Monitoring/nagios/plugins/check_pgsql) | bin | 40656 -> 40656 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ping (renamed from Monitoring/nagios/plugins/check_ping) | bin | 48848 -> 48848 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_pop (renamed from Monitoring/nagios/plugins/check_pop) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_procs (renamed from Monitoring/nagios/plugins/check_procs) | bin | 114640 -> 114640 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_radius (renamed from Monitoring/nagios/plugins/check_radius) | bin | 40624 -> 40624 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_real (renamed from Monitoring/nagios/plugins/check_real) | bin | 40464 -> 40464 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_rpc (renamed from Monitoring/nagios/plugins/check_rpc) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_rta_multi (renamed from Monitoring/nagios/plugins/check_rta_multi) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_sensors (renamed from Monitoring/nagios/plugins/check_sensors) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_shinken.py (renamed from Monitoring/nagios/plugins/check_shinken.py) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_simap (renamed from Monitoring/nagios/plugins/check_simap) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_sip (renamed from Monitoring/nagios/plugins/check_sip) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_smtp (renamed from Monitoring/nagios/plugins/check_smtp) | bin | 127216 -> 127216 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_snmp (renamed from Monitoring/nagios/plugins/check_snmp) | bin | 152008 -> 152008 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_speed (renamed from Monitoring/nagios/plugins/check_speed) | 0 | ||||
| l--------- | god/Monitoring/nagios/plugins/check_spop (renamed from Monitoring/nagios/plugins/check_spop) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ssh (renamed from Monitoring/nagios/plugins/check_ssh) | bin | 36688 -> 36688 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_ssmtp (renamed from Monitoring/nagios/plugins/check_ssmtp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_swap (renamed from Monitoring/nagios/plugins/check_swap) | bin | 37832 -> 37832 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_tcp (renamed from Monitoring/nagios/plugins/check_tcp) | bin | 49328 -> 49328 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_temper (renamed from Monitoring/nagios/plugins/check_temper) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_time (renamed from Monitoring/nagios/plugins/check_time) | bin | 38128 -> 38128 bytes | |||
| l--------- | god/Monitoring/nagios/plugins/check_udp (renamed from Monitoring/nagios/plugins/check_udp) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_ups (renamed from Monitoring/nagios/plugins/check_ups) | bin | 44560 -> 44560 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_users (renamed from Monitoring/nagios/plugins/check_users) | bin | 36168 -> 36168 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/check_wave (renamed from Monitoring/nagios/plugins/check_wave) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/getwmic.sh (renamed from Monitoring/nagios/plugins/getwmic.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/link_vmware_host_vm.py (renamed from Monitoring/nagios/plugins/link_vmware_host_vm.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/negate (renamed from Monitoring/nagios/plugins/negate) | bin | 38152 -> 38152 bytes | |||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/nmap_discovery_runner.py (renamed from Monitoring/nagios/plugins/nmap_discovery_runner.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/notify.sh (renamed from Monitoring/nagios/plugins/notify.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/notify_irc (renamed from Monitoring/nagios/plugins/notify_irc) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/nsca_client.py (renamed from Monitoring/nagios/plugins/nsca_client.py) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/sendmailhost.pl (renamed from Monitoring/nagios/plugins/sendmailhost.pl) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/sendmailservices.pl (renamed from Monitoring/nagios/plugins/sendmailservices.pl) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/urlize (renamed from Monitoring/nagios/plugins/urlize) | bin | 36104 -> 36104 bytes | |||
| -rw-r--r-- | god/Monitoring/nagios/plugins/utils.pm (renamed from Monitoring/nagios/plugins/utils.pm) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/utils.sh (renamed from Monitoring/nagios/plugins/utils.sh) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/plugins/vmware_discovery_runner.py (renamed from Monitoring/nagios/plugins/vmware_discovery_runner.py) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/brokerd-windows.ini (renamed from Monitoring/nagios/shinken/brokerd-windows.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/brokerd.ini (renamed from Monitoring/nagios/shinken/brokerd.ini) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/shinken/certs/ca.pem (renamed from Monitoring/nagios/shinken/certs/ca.pem) | 0 | ||||
| -rwxr-xr-x | god/Monitoring/nagios/shinken/certs/client.pem (renamed from Monitoring/nagios/shinken/certs/client.pem) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/certs/server.pem (renamed from Monitoring/nagios/shinken/certs/server.pem) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/commands.cfg (renamed from Monitoring/nagios/shinken/commands.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/contactgroups.cfg (renamed from Monitoring/nagios/shinken/contactgroups.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/contacts.cfg (renamed from Monitoring/nagios/shinken/contacts.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/dependencies.cfg (renamed from Monitoring/nagios/shinken/dependencies.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/discovery.cfg (renamed from Monitoring/nagios/shinken/discovery.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/discovery_rules.cfg (renamed from Monitoring/nagios/shinken/discovery_rules.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/discovery_runs.cfg (renamed from Monitoring/nagios/shinken/discovery_runs.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/escalations.cfg (renamed from Monitoring/nagios/shinken/escalations.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/hostgroups.cfg (renamed from Monitoring/nagios/shinken/hostgroups.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/hosts/localhost.cfg (renamed from Monitoring/nagios/shinken/hosts/localhost.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/nagios-windows.cfg (renamed from Monitoring/nagios/shinken/nagios-windows.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/nagios.cfg (renamed from Monitoring/nagios/shinken/nagios.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg (renamed from Monitoring/nagios/shinken/objects/groups/root_contact.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg (renamed from Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg (renamed from Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg (renamed from Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg (renamed from Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg (renamed from Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg (renamed from Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg (renamed from Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg (renamed from Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg (renamed from Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg (renamed from Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg (renamed from Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg (renamed from Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg (renamed from Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg (renamed from Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/pollerd-windows.ini (renamed from Monitoring/nagios/shinken/pollerd-windows.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/pollerd.ini (renamed from Monitoring/nagios/shinken/pollerd.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/reactionnerd-windows.ini (renamed from Monitoring/nagios/shinken/reactionnerd-windows.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/reactionnerd.ini (renamed from Monitoring/nagios/shinken/reactionnerd.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/receiverd-windows.ini (renamed from Monitoring/nagios/shinken/receiverd-windows.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/receiverd.ini (renamed from Monitoring/nagios/shinken/receiverd.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/resource.cfg (renamed from Monitoring/nagios/shinken/resource.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/schedulerd-windows.ini (renamed from Monitoring/nagios/shinken/schedulerd-windows.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/schedulerd.ini (renamed from Monitoring/nagios/shinken/schedulerd.ini) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/servicegroups.cfg (renamed from Monitoring/nagios/shinken/servicegroups.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/services/linux_local.cfg (renamed from Monitoring/nagios/shinken/services/linux_local.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg (renamed from Monitoring/nagios/shinken/shinken-specific-high-availability.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg (renamed from Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/shinken-specific.cfg (renamed from Monitoring/nagios/shinken/shinken-specific.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/templates.cfg (renamed from Monitoring/nagios/shinken/templates.cfg) | 0 | ||||
| -rw-r--r-- | god/Monitoring/nagios/shinken/timeperiods.cfg (renamed from Monitoring/nagios/shinken/timeperiods.cfg) | 0 | ||||
| -rw-r--r-- | god/census/Makefile (renamed from census/Makefile) | 0 | ||||
| -rw-r--r-- | god/census/README.md (renamed from census/README.md) | 0 | ||||
| -rw-r--r-- | god/census/TODO.md (renamed from census/TODO.md) | 0 | ||||
| -rw-r--r-- | god/census/VERSION (renamed from census/VERSION) | 0 | ||||
| -rwxr-xr-x | god/census/arping.py (renamed from census/arping.py) | 0 | ||||
| -rwxr-xr-x | god/census/arping_users.py (renamed from census/arping_users.py) | 0 | ||||
| -rw-r--r-- | god/census/mac_names.lst (renamed from census/mac_names.lst) | 0 | ||||
| -rwxr-xr-x | god/census/sched-arping (renamed from census/sched-arping) | 0 | ||||
| -rw-r--r-- | god/census/title.lst (renamed from census/title.lst) | 0 | ||||
| -rw-r--r-- | god/claws/.gitignore (renamed from claws/.gitignore) | 0 | ||||
| -rw-r--r-- | god/claws/Makefile (renamed from claws/Makefile) | 0 | ||||
| -rw-r--r-- | god/claws/README.md | 12 | ||||
| -rw-r--r-- | god/claws/communication.h (renamed from claws/communication.h) | 0 | ||||
| -rw-r--r-- | god/claws/rcontrol.c (renamed from claws/rcontrol.c) | 0 | ||||
| -rw-r--r-- | god/filebitch/COPYING (renamed from filebitch/COPYING) | 0 | ||||
| -rw-r--r-- | god/filebitch/README (renamed from filebitch/README) | 0 | ||||
| -rw-r--r-- | god/filebitch/TODO (renamed from filebitch/TODO) | 0 | ||||
| -rwxr-xr-x | god/filebitch/connect_narf.pl (renamed from filebitch/connect_narf.pl) | 0 | ||||
| -rwxr-xr-x | god/filebitch/disconnect_narf.pl (renamed from filebitch/disconnect_narf.pl) | 0 | ||||
| -rw-r--r-- | god/icecrab/Makefile (renamed from icecrab/Makefile) | 0 | ||||
| -rw-r--r-- | god/icecrab/icecast.xml (renamed from icecrab/icecast.xml) | 0 | ||||
| -rw-r--r-- | god/icecrab/icecast2.conf (renamed from icecrab/icecast2.conf) | 0 | ||||
| -rw-r--r-- | god/ivan/Makefile | 7 | ||||
| -rwxr-xr-x | god/ivan/ivan (renamed from evan/evan) | 2 | ||||
| -rwxr-xr-x | god/ivan/ivan-startup (renamed from evan/evan-startup) | 0 | ||||
| -rw-r--r-- | god/ivan/satz-liste (renamed from evan/satz-liste) | 0 | ||||
| -rw-r--r-- | god/kachelmann/.gitignore (renamed from kachelmann/.gitignore) | 0 | ||||
| -rw-r--r-- | god/kachelmann/Makefile (renamed from kachelmann/Makefile) | 0 | ||||
| -rwxr-xr-x | god/kachelmann/wetter (renamed from kachelmann/wetter) | 0 | ||||
| -rwxr-xr-x | god/meinsack/index (renamed from meinsack/index) | 0 | ||||
| -rwxr-xr-x | god/meinsack/shack-sack (renamed from shack/meinsack/index) | 4 | ||||
| -rw-r--r-- | god/streams/.gitignore | 1 | ||||
| -rw-r--r-- | god/streams/Makefile (renamed from streams/Makefile) | 6 | ||||
| -rw-r--r-- | god/streams/README.md | 38 | ||||
| -rw-r--r-- | god/streams/bin/helper/streamfind | 10 | ||||
| -rw-r--r-- | god/streams/bin/helper/streamwrite | 6 | ||||
| -rwxr-xr-x | god/streams/bin/mpdstreams (renamed from streams/mpdstreams) | 3 | ||||
| -rwxr-xr-x | god/streams/bin/relaxxapi.py (renamed from streams/relaxxapi.py) | 0 | ||||
| -rwxr-xr-x | god/streams/bin/relaxxstreams (renamed from streams/relaxxstreams) | 4 | ||||
| -rwxr-xr-x | god/streams/bin/stream-starter (renamed from streams/stream-starter) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | god/streams/bin/streams (renamed from streams/streams.py) | 2 | ||||
| -rw-r--r-- | god/streams/db/direct.db | 78 | ||||
| -rw-r--r-- | god/streams/db/stream.db (renamed from streams/stream.db) | 4 | ||||
| -rw-r--r-- | god/streams/doc/relaxxplayer.api (renamed from streams/relaxxplayer.api) | 2 | ||||
| -rw-r--r-- | god/streichelzoo/README (renamed from streichelzoo/README) | 0 | ||||
| -rw-r--r-- | god/streichelzoo/button_down.png (renamed from streichelzoo/button_down.png) | bin | 6501 -> 6501 bytes | |||
| -rw-r--r-- | god/streichelzoo/button_up.png (renamed from streichelzoo/button_up.png) | bin | 6655 -> 6655 bytes | |||
| -rw-r--r-- | god/streichelzoo/main.avg (renamed from streichelzoo/main.avg) | 0 | ||||
| -rw-r--r-- | god/streichelzoo/streichelzoo.py (renamed from streichelzoo/streichelzoo.py) | 0 | ||||
| -rw-r--r-- | god/strom-decoder/main.py (renamed from shack/strom/main.py) | 0 | ||||
| -rw-r--r-- | god/strom-decoder/testdata (renamed from shack/strom/testdata) | 0 | ||||
| -rw-r--r-- | god/strom-decoder/testdatacomment (renamed from shack/strom/testdatacomment) | 0 | ||||
| -rw-r--r-- | god/temper/.gitignore (renamed from temper/.gitignore) | 0 | ||||
| -rw-r--r-- | god/temper/99-tempsensor.rules (renamed from temper/99-tempsensor.rules) | 0 | ||||
| -rw-r--r-- | god/temper/Makefile | 20 | ||||
| -rwxr-xr-x | god/temper/collectd-temper.sh | 9 | ||||
| -rw-r--r-- | god/temper/temper.c (renamed from temper/temper.c) | 0 | ||||
| -rw-r--r-- | god/temper/temper.h (renamed from temper/temper.h) | 0 | ||||
| -rw-r--r-- | god/twinter/init_stripped.py | 10 | ||||
| -rw-r--r-- | gold/affiliate/README.md | 9 | ||||
| -rw-r--r-- | gold/affiliate/affiliate.user.js | 96 | ||||
| -rwxr-xr-x | infest/skel/etc/rc.local | 2 | ||||
| -rw-r--r-- | minikrebs/.gitignore | 1 | ||||
| -rw-r--r-- | minikrebs/build/heckenkrebs-factory.bin | bin | 0 -> 3932160 bytes | |||
| -rw-r--r-- | minikrebs/build/heckenkrebs-sysupgrade.bin | bin | 0 -> 3538948 bytes | |||
| -rw-r--r-- | minikrebs/doc/Camkrebs | 19 | ||||
| -rw-r--r-- | minikrebs/doc/QUICKSTART | 37 | ||||
| -rw-r--r-- | minikrebs/doc/TLDR | 3 | ||||
| -rw-r--r-- | minikrebs/doc/lazorcam_druck.svg | 231 | ||||
| -rw-r--r-- | minikrebs/oncology/Makefile (renamed from oncology/Makefile) | 0 | ||||
| -rw-r--r-- | minikrebs/oncology/README | 1 | ||||
| -rw-r--r-- | minikrebs/oncology/config/full.conf (renamed from oncology/lcd4linux.conf) | 0 | ||||
| -rwxr-xr-x | minikrebs/prepare | 45 | ||||
| -rw-r--r-- | minikrebs/profiles/README.md | 9 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/custom_make | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/customfiles/etc/config/network | 17 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/customfiles/etc/config/wireless | 18 | ||||
| l--------- | minikrebs/profiles/heckenkrebs/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/customfiles/etc/rc.local | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/customfiles/etc/wifiblack | 0 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/customfiles/etc/wifipw | 1 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/customfiles/usr/bin/aap | 115 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/customfiles/usr/bin/easybox_keygen | 40 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/customfiles/usr/bin/infest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/customfiles/usr/bin/ledoff | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/heckenkrebs/customfiles/usr/bin/tinc-update | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/heckenkrebs/doc/README.md | 19 | ||||
| -rwxr-xr-x | minikrebs/profiles/init | 39 | ||||
| -rw-r--r-- | minikrebs/profiles/init_overlay | 10 | ||||
| -rwxr-xr-x | minikrebs/profiles/instacam/custom_make | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/instacam/customfiles/etc/config/network | 9 | ||||
| l--------- | minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/instacam/customfiles/etc/rc.local | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/instacam/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/instacam/doc/README.md | 52 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs/custom_make | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/config/network | 14 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/config/system | 11 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/config/tinc | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/instakrebs/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| l--------- | minikrebs/profiles/instakrebs/customfiles/etc/rc.d/tinc | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/rc.local | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/customfiles/etc/shadow | 5 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs/customfiles/usr/bin/autoinfest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs/customfiles/usr/bin/genhostid | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs/customfiles/usr/bin/led | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs/customfiles/usr/bin/tinc-update | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs/doc/README.md | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs_zc3xx/custom_make | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/network | 14 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/system | 11 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/rc.local | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/shadow | 5 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/autoinfest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/genhostid | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/led | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/tinc-update | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/instakrebs_zc3xx/doc/README.md | 6 | ||||
| -rwxr-xr-x | minikrebs/profiles/krebs/custom_make | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/config/network | 14 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/config/system | 11 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/krebs/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/rc.local | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/customfiles/etc/shadow | 5 | ||||
| -rwxr-xr-x | minikrebs/profiles/krebs/customfiles/usr/bin/autoinfest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/krebs/customfiles/usr/bin/genhostid | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/krebs/customfiles/usr/bin/led | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/krebs/customfiles/usr/bin/tinc-update | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/krebs/doc/README.md | 8 | ||||
| -rwxr-xr-x | minikrebs/profiles/lazorkrebs/custom_make | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/lazorkrebs/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/lazorkrebs/customfiles/etc/config/network | 9 | ||||
| l--------- | minikrebs/profiles/lazorkrebs/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/lazorkrebs/customfiles/etc/rc.local | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/lazorkrebs/customfiles/etc/shadow | 5 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/custom_make | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/customfiles/etc/config/network | 14 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/customfiles/etc/config/system | 23 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/nfc-login/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/customfiles/etc/rc.local | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/customfiles/etc/shadow | 5 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/customfiles/usr/bin/autoinfest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/customfiles/usr/bin/genhostid | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/customfiles/usr/bin/led | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/customfiles/usr/bin/login-manager | 34 | ||||
| -rwxr-xr-x | minikrebs/profiles/nfc-login/customfiles/usr/bin/tinc-update | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/nfc-login/doc/README.md | 10 | ||||
| -rwxr-xr-x | minikrebs/profiles/rickroller_advanced/airbase-ng | bin | 0 -> 89141 bytes | |||
| -rwxr-xr-x | minikrebs/profiles/rickroller_advanced/custom_make | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp | 28 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/firewall | 112 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/fstab | 19 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/network | 15 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/system | 8 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/uhttpd | 13 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/rickroller_advanced/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.crt | bin | 0 -> 529 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key | bin | 0 -> 609 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/doc/OVERLAY | 6 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/doc/README.md | 10 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/overlay/www/1x1.gif | bin | 0 -> 35 bytes | |||
| -rwxr-xr-x | minikrebs/profiles/rickroller_advanced/overlay/www/cgi-bin/rrhelper | 15 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/overlay/www/index.html | 27 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/overlay/www/rick.gif | bin | 0 -> 506229 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_advanced/overlay/www/rick.ogg | bin | 0 -> 390604 bytes | |||
| -rwxr-xr-x | minikrebs/profiles/rickroller_bare/custom_make | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/dhcp | 28 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/firewall | 112 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/network | 15 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/system | 8 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/uhttpd | 13 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/config/wireless | 19 | ||||
| l--------- | minikrebs/profiles/rickroller_bare/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.crt | bin | 0 -> 529 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.key | bin | 0 -> 609 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/www/1x1.gif | bin | 0 -> 35 bytes | |||
| -rwxr-xr-x | minikrebs/profiles/rickroller_bare/customfiles/www/cgi-bin/rrhelper | 15 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/www/index.html | 27 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/www/rick.gif | bin | 0 -> 506229 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/customfiles/www/rick.ogg | bin | 0 -> 390604 bytes | |||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/doc/README.md | 24 | ||||
| -rw-r--r-- | minikrebs/profiles/rickroller_bare/doc/videoconvert | 7 | ||||
| -rwxr-xr-x | minikrebs/profiles/streamerkrebs/custom_make | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer | 7 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/config/network | 9 | ||||
| l--------- | minikrebs/profiles/streamerkrebs/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/rc.local | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/customfiles/root/load_dependencies | 12 | ||||
| -rw-r--r-- | minikrebs/profiles/streamerkrebs/doc/README.md | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/usbbridge/custom_make | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/usbbridge/customfiles/etc/config/network | 9 | ||||
| l--------- | minikrebs/profiles/usbbridge/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/usbbridge/customfiles/etc/rc.local | 3 | ||||
| -rw-r--r-- | minikrebs/profiles/usbbridge/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/usbbridge/doc/README | 21 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/.gitignore | 1 | ||||
| -rwxr-xr-x | minikrebs/profiles/wifibridge/custom_make | 2 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/config/firewall | 104 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/config/fstab | 19 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/config/network | 17 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/config/wireless | 21 | ||||
| l--------- | minikrebs/profiles/wifibridge/customfiles/etc/dropbear/authorized_keys | 1 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/rc.local | 4 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/etc/shadow | 5 | ||||
| -rw-r--r-- | minikrebs/profiles/wifibridge/customfiles/root/.ssh/authorized_keys | 1 | ||||
| -rwxr-xr-x | minikrebs/profiles/wifibridge/customfiles/usr/bin/autoinfest | 4 | ||||
| -rwxr-xr-x | minikrebs/profiles/wifibridge/customfiles/usr/bin/genhostid | 2 | ||||
| -rwxr-xr-x | minikrebs/profiles/wifibridge/customfiles/usr/bin/led | 3 | ||||
| -rwxr-xr-x | minikrebs/profiles/wifibridge/customfiles/usr/bin/tinc-update | 4 | ||||
| -rwxr-xr-x | minikrebs/upgrade | 31 | ||||
| -rw-r--r-- | node/Makefile | 8 | ||||
| -rwxr-xr-x | node/install | 79 | ||||
| -rwxr-xr-x | node/tools/latest-version | 19 | ||||
| -rw-r--r-- | punani/db/punani | 2 | ||||
| -rwxr-xr-x | punani/host/dist/arch/getsize (renamed from host/dist/arch/getsize) | 0 | ||||
| -rwxr-xr-x | retiolum/bin/announce_pubkey | 35 | ||||
| -rwxr-xr-x | retiolum/bin/check-free-retiolum-v4 | 2 | ||||
| -rwxr-xr-x | retiolum/bin/create-host-tar | 15 | ||||
| -rwxr-xr-x | retiolum/bin/create-supernode-tar | 13 | ||||
| -rwxr-xr-x | retiolum/bin/dump-graph | 9 | ||||
| l--------- | retiolum/bin/tinc_stats | 1 | ||||
| l--------- | retiolum/bin/tinc_stats2json | 1 | ||||
| -rw-r--r-- | retiolum/doc/cronjob | 7 | ||||
| -rw-r--r-- | retiolum/doc/git_checkout_only_hosts | 11 | ||||
| -rw-r--r-- | retiolum/doc/highping | 2 | ||||
| -rw-r--r-- | retiolum/hosts/TodesBrot | 9 | ||||
| -rw-r--r-- | retiolum/hosts/albi10 | 11 | ||||
| -rw-r--r-- | retiolum/hosts/also | 12 | ||||
| -rw-r--r-- | retiolum/hosts/casino | 11 | ||||
| -rw-r--r-- | retiolum/hosts/euer | 2 | ||||
| -rw-r--r-- | retiolum/hosts/filebitch | 10 | ||||
| -rw-r--r-- | retiolum/hosts/filebitchin | 10 | ||||
| -rw-r--r-- | retiolum/hosts/iiso | 11 | ||||
| -rw-r--r-- | retiolum/hosts/incept | 2 | ||||
| -rw-r--r-- | retiolum/hosts/juhulian | 11 | ||||
| -rw-r--r-- | retiolum/hosts/khackplug | 11 | ||||
| -rw-r--r-- | retiolum/hosts/laqueus | 4 | ||||
| -rw-r--r-- | retiolum/hosts/minikrebs | 2 | ||||
| -rw-r--r-- | retiolum/hosts/muhbaasu | 2 | ||||
| -rw-r--r-- | retiolum/hosts/nomic | 10 | ||||
| -rw-r--r-- | retiolum/hosts/oxberg | 11 | ||||
| -rw-r--r-- | retiolum/hosts/pico | 2 | ||||
| -rw-r--r-- | retiolum/hosts/pigstarter | 2 | ||||
| -rw-r--r-- | retiolum/hosts/rubus | 11 | ||||
| -rw-r--r-- | retiolum/hosts/xso | 10 | ||||
| -rwxr-xr-x | retiolum/openwrt/tinc-up | 19 | ||||
| -rwxr-xr-x | retiolum/openwrt/updater | 6 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/all_the_graphs.sh | 9 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/anonytize.sh | 2 | ||||
| -rw-r--r-- | retiolum/scripts/adv_graphgen/find_super.py | 50 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse_tinc_anon.py | 4 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 18 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/sanitize.sh | 2 | ||||
| -rwxr-xr-x | retiolum/scripts/adv_graphgen/tinc_stats2json (renamed from retiolum/scripts/adv_graphgen/tinc_stats.py) | 59 | ||||
| -rw-r--r-- | retiolum/scripts/github_listener/INSTALL | 13 | ||||
| -rw-r--r-- | retiolum/scripts/github_listener/README | 22 | ||||
| -rw-r--r-- | retiolum/scripts/github_listener/github_listener.conf | 5 | ||||
| -rwxr-xr-x | retiolum/scripts/github_listener/handle_request | 23 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/bootstrap.sh | 11 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 8 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 407 | ||||
| -rw-r--r-- | retiolum/scripts/tinc_setup/write_channel.py | 27 | ||||
| -rw-r--r-- | sandbox/27c3_ticket_grabber/mechanize_tickets.py (renamed from too_old/mechanize_tickets.py) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/README.md (renamed from DNA/README.md) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/linux/LICENSE (renamed from DNA/linux/LICENSE) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/linux/Makefile (renamed from DNA/linux/Makefile) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/linux/README.md (renamed from DNA/linux/README.md) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/linux/TODO (renamed from DNA/linux/TODO) | 0 | ||||
| -rw-r--r-- | sandbox/DNA/linux/krebs.c (renamed from DNA/linux/krebs.c) | 0 | ||||
| -rw-r--r-- | sandbox/README.md | 5 | ||||
| -rw-r--r-- | sandbox/cobra/README.md (renamed from cobra/README) | 31 | ||||
| -rw-r--r-- | sandbox/cobra/hello/index.sh (renamed from cobra/hello/index.sh) | 0 | ||||
| -rwxr-xr-x | sandbox/cobra/index.sh (renamed from cobra/index.sh) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/README.md (renamed from hyper/README.md) | 0 | ||||
| -rwxr-xr-x | sandbox/hyper/influx/http/index.js (renamed from hyper/influx/http/index.js) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/process/Makefile (renamed from hyper/process/Makefile) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/process/main.go (renamed from hyper/process/main.go) | 0 | ||||
| -rwxr-xr-x | sandbox/hyper/process/spawn (renamed from hyper/process/spawn) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/process/src/hyper/process/Makefile (renamed from hyper/process/src/hyper/process/Makefile) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/process/src/hyper/process/process.go (renamed from hyper/process/src/hyper/process/process.go) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/process/test/bc.json (renamed from hyper/process/test/bc.json) | 0 | ||||
| -rw-r--r-- | sandbox/hyper/sink/index.js (renamed from hyper/sink/index.js) | 0 | ||||
| -rwxr-xr-x | sandbox/json/sh/json.sh (renamed from json/sh/json.sh) | 0 | ||||
| -rw-r--r-- | sandbox/json/sh/test.json (renamed from json/sh/test.json) | 0 | ||||
| -rwxr-xr-x | sandbox/meta/bin/update (renamed from meta/bin/update) | 0 | ||||
| -rwxr-xr-x | sandbox/meta/install (renamed from meta/install) | 0 | ||||
| -rw-r--r-- | sandbox/roboctl/index.js (renamed from roboctl/index.js) | 0 | ||||
| -rw-r--r-- | sandbox/roboctl/lib/irc.js (renamed from roboctl/lib/irc.js) | 0 | ||||
| -rwxr-xr-x | sandbox/tinc_multicast/retiolum (renamed from retiolum/scripts/tinc_multicast/retiolum) | 0 | ||||
| -rwxr-xr-x | sandbox/tinc_multicast/retiolum.py (renamed from retiolum/scripts/tinc_multicast/retiolum.py) | 0 | ||||
| -rw-r--r-- | sandbox/zoneminder/Makefile (renamed from zoneminder/Makefile) | 0 | ||||
| -rw-r--r-- | sandbox/zoneminder/zmdc.pl-LD_PRELOAD.patch (renamed from zoneminder/zmdc.pl-LD_PRELOAD.patch) | 0 | ||||
| -rw-r--r-- | sandbox/zoneminder/zoneminder.conf (renamed from zoneminder/zoneminder.conf) | 0 | ||||
| -rw-r--r-- | streams/README | 10 | ||||
| -rwxr-xr-x | streams/streams | 131 | ||||
| -rw-r--r-- | util/morse/COPYING (renamed from morse/COPYING) | 0 | ||||
| -rw-r--r-- | util/morse/Makefile (renamed from morse/Makefile) | 0 | ||||
| -rw-r--r-- | util/morse/README (renamed from morse/README) | 0 | ||||
| -rwxr-xr-x | util/morse/morse.sh (renamed from morse/morse.sh) | 0 | ||||
| l--------- | util/tts/bin/alberto (renamed from tts/bin/alberto) | 0 | ||||
| l--------- | util/tts/bin/anjali (renamed from tts/bin/anjali) | 0 | ||||
| l--------- | util/tts/bin/arnaud (renamed from tts/bin/arnaud) | 0 | ||||
| l--------- | util/tts/bin/audrey (renamed from tts/bin/audrey) | 0 | ||||
| l--------- | util/tts/bin/charles (renamed from tts/bin/charles) | 0 | ||||
| l--------- | util/tts/bin/claire (renamed from tts/bin/claire) | 0 | ||||
| l--------- | util/tts/bin/crystal (renamed from tts/bin/crystal) | 0 | ||||
| l--------- | util/tts/bin/francesca (renamed from tts/bin/francesca) | 0 | ||||
| l--------- | util/tts/bin/giovanni (renamed from tts/bin/giovanni) | 0 | ||||
| l--------- | util/tts/bin/juliette (renamed from tts/bin/juliette) | 0 | ||||
| l--------- | util/tts/bin/klara (renamed from tts/bin/klara) | 0 | ||||
| l--------- | util/tts/bin/lauren (renamed from tts/bin/lauren) | 0 | ||||
| l--------- | util/tts/bin/mike (renamed from tts/bin/mike) | 0 | ||||
| l--------- | util/tts/bin/reiner (renamed from tts/bin/reiner) | 0 | ||||
| l--------- | util/tts/bin/rich (renamed from tts/bin/rich) | 0 | ||||
| l--------- | util/tts/bin/rosa (renamed from tts/bin/rosa) | 0 | ||||
| -rw-r--r-- | util/tts/names (renamed from tts/names) | 0 | ||||
| -rwxr-xr-x | webcams/cam1.sh | 2 |
594 files changed, 3256 insertions, 511 deletions
diff --git a/cholerab/assets/ass.txt b/assets/doc/ass.txt index f10d2ba1..f10d2ba1 100644 --- a/cholerab/assets/ass.txt +++ b/assets/doc/ass.txt diff --git a/cholerab/assets/lexikon.txt b/assets/doc/lexikon.txt index 0d362100..0d362100 100644 --- a/cholerab/assets/lexikon.txt +++ b/assets/doc/lexikon.txt diff --git a/cholerab/assets/structs.nojson b/assets/doc/structs.nojson index 4c084862..4c084862 100644 --- a/cholerab/assets/structs.nojson +++ b/assets/doc/structs.nojson diff --git a/cholerab/assets/usecases.txt b/assets/doc/usecases.txt index a3e2a4fa..a3e2a4fa 100644 --- a/cholerab/assets/usecases.txt +++ b/assets/doc/usecases.txt diff --git a/boot/lighttpd.conf b/boot/lighttpd.conf new file mode 100644 index 00000000..e8d621aa --- /dev/null +++ b/boot/lighttpd.conf @@ -0,0 +1,12 @@ +$HTTP["host"] =~ "(^|\.)boot\.krebsco\.de$" { + server.document-root = "/krebs/boot" + server.errorlog = "/var/log/lighttpd/boot.krebsco.de/error.log" + accesslog.filename = "/var/log/lighttpd/boot.krebsco.de/access.log" + url.rewrite-if-not-file = ( ".*" => "/bootstrap.sh" ) +} +$HTTP["host"] =~ "(^|\.)tinc\.krebsco\.de$" { + server.document-root = "/krebs/boot" + server.errorlog = "/var/log/lighttpd/boot.krebsco.de/error.log" + accesslog.filename = "/var/log/lighttpd/boot.krebsco.de/access.log" + url.rewrite-if-not-file = ( ".*" => "/retiolum.sh" ) +} diff --git a/boot/painload.sh b/boot/painload.sh new file mode 120000 index 00000000..1ee91d92 --- /dev/null +++ b/boot/painload.sh @@ -0,0 +1 @@ +../infest/bootstrap.sh
\ No newline at end of file diff --git a/boot/retiolum.sh b/boot/retiolum.sh new file mode 120000 index 00000000..69425ea9 --- /dev/null +++ b/boot/retiolum.sh @@ -0,0 +1 @@ +../retiolum/scripts/tinc_setup/new_install.sh
\ No newline at end of file diff --git a/cholerab/AGENDA b/cholerab/AGENDA index d2c1ae1f..7db8100f 100644 --- a/cholerab/AGENDA +++ b/cholerab/AGENDA @@ -1,9 +1,5 @@ - krebs - - krebs.no.de/hosts.tar automatic via github POST hook - - same for supernode updates [vs. cron] - - krebscode/painload/supernode/foo - - overall - krebs/bin at the end of PATH diff --git a/cholerab/pattern/README b/cholerab/ENTERPRISE_PATTERN index 0980ac6e..4e417709 100644 --- a/cholerab/pattern/README +++ b/cholerab/ENTERPRISE_PATTERN @@ -65,4 +65,20 @@ Literate Programming -------------------- Omit all the comments. +Litterate Programming +--------------------- +Write throw-away code and it will become production code + +Enterprise Expect +----------------- +Because you always know what you want, `expect(3)` script code can be replaced +by a `subshell and pipe` pattern : + +<code> + ( echo "$username"; sleep 1; echo "$password"; sleep 1; echo "cp old new" ) | telnet +</code> + +painload example: `//retiolum/bin/announce_pubkey` + + diff --git a/cholerab/bling/krebs_aquarium.svg b/cholerab/bling/krebs_aquarium.svg new file mode 100644 index 00000000..ad53cfca --- /dev/null +++ b/cholerab/bling/krebs_aquarium.svg @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + id="svg4376" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="krebs_aquarium.svg"> + <defs + id="defs4378" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="28.963094" + inkscape:cx="9.7979626" + inkscape:cy="9.1371782" + inkscape:document-units="px" + inkscape:current-layer="a4396" + showgrid="true" + showguides="true" + width="16px" + inkscape:snap-bbox="true" + inkscape:snap-global="true" + inkscape:object-paths="false" + inkscape:bbox-paths="false" + inkscape:object-nodes="false" + inkscape:snap-grids="true" + inkscape:window-width="483" + inkscape:window-height="747" + inkscape:window-x="0" + inkscape:window-y="19" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid4384" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata4381"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1036.3622)"> + <a + id="a4396"> + <a + id="a4960" + transform="translate(5e-6,1)" /> + <a + transform="translate(7.000005,1)" + id="a4960-3"> + <path + id="rect5009-9" + transform="translate(0,1036.3622)" + style="fill:#e4002b;fill-opacity:1" + d="m 4.999995,10 5e-6,1 0,2 1,0 0,1 -2,0 -5e-6,-2 0,-1 0,-1 z M -2,11 l -5e-6,-1 1,0 0,1 0,1 5e-6,2 -2,0 0,-1 1,0 z m -3.000005,-10.0003 0,3 1,0 0,-3 1,0 0,5 -1,0 0,1 2,0 0,-1 1,0 0,-1 1,0 0,-1 -1,0 0,-2 2,0 0,3 2,0 0,-1 -1,0 0,-2 2,0 0,3 0,1 1,0 0,1 2,0 0,-1 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 1,0 0,3 1,0 0,-3 1,0 0,4.9553 -1,0.045 0,2 -3,0 0,1 2,0 0,1 1,0 0,1 0,3 -1,0 0,-3 L 6.01656,11 6,10 l -3,0 0,4 -1,0 0,-3 -1,0 0,3 -1,0 0,-4 -3,0 0,1 -1,0 0,3 -1,0 0,-3 -5e-6,-1 1,0 5e-6,-1 2,0 0,-1 -3,0 0,-2 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 z" /> + </a> + </a> + </g> +</svg> diff --git a/cholerab/bling/krebs_plain.svg b/cholerab/bling/krebs_plain.svg index 3d048097..59e21f60 100644 --- a/cholerab/bling/krebs_plain.svg +++ b/cholerab/bling/krebs_plain.svg @@ -9,14 +9,50 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2876" + width="16" + height="16" + id="svg4376" version="1.1" - inkscape:version="0.47 r22583" - width="891" - height="743" - sodipodi:docname="Screen Shot 2011-08-04 at 04.13.20.png"> + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="krebs_plain.svg"> + <defs + id="defs4378" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="28.963094" + inkscape:cx="7.4015919" + inkscape:cy="7.0928138" + inkscape:document-units="px" + inkscape:current-layer="a4396" + showgrid="true" + showguides="true" + width="16px" + inkscape:snap-bbox="true" + inkscape:snap-global="true" + inkscape:object-paths="false" + inkscape:bbox-paths="false" + inkscape:object-nodes="false" + inkscape:snap-grids="true" + inkscape:window-width="1160" + inkscape:window-height="747" + inkscape:window-x="204" + inkscape:window-y="19" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid4384" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> <metadata - id="metadata2882"> + id="metadata4381"> <rdf:RDF> <cc:Work rdf:about=""> @@ -27,49 +63,41 @@ </cc:Work> </rdf:RDF> </metadata> - <defs - id="defs2880"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - id="perspective2884" /> - </defs> - <sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1436" - inkscape:window-height="856" - id="namedview2878" - showgrid="false" - inkscape:snap-to-guides="true" - inkscape:snap-grids="true" - inkscape:snap-bbox="true" - inkscape:zoom="0.81830417" - inkscape:cx="445.5" - inkscape:cy="371.5" - inkscape:window-x="4" - inkscape:window-y="0" - inkscape:window-maximized="1" - inkscape:current-layer="svg2876" /> - <path - style="fill:#e4002b;fill-opacity:1" - d="m 244.0219,617.03493 c -0.21558,-0.56245 -0.27058,-11.13745 -0.12223,-23.5 l 0.26974,-22.47737 22,-0.5 22,-0.5 0.26031,-44.76841 0.26031,-44.7684 23.23969,0.2684 23.23969,0.26841 0.257,67.7787 c 0.20362,53.70074 -0.004,67.87425 -1,68.23871 -2.76038,1.01019 -90.01678,0.97154 -90.40451,-0.04 z" - id="path3699" /> - <path - style="fill:#e4002b;fill-opacity:1" - d="m 382.14297,617.3264 c -0.26297,-0.69786 -0.5896,-41.99384 -0.72584,-91.76884 l -0.24772,-90.5 -68,0 -68,0 -0.5,22.5 -0.5,22.5 -21.97012,0.27012 c -13.36172,0.16427 -22.37364,0.67349 -23,1.29959 -0.67593,0.67568 -1.20172,24.12474 -1.52988,68.22989 l -0.5,67.2004 -21.93,0.27 c -12.06149,0.14851 -22.28992,-0.0899 -22.72984,-0.52984 -0.43992,-0.43992 -0.82782,-31.38642 -0.86202,-68.77 l -0.0622,-67.97016 22.79201,-0.5 22.79201,-0.5 0.5,-46 0.5,-46 45,-0.5 45,-0.5 0,-22 0,-22 -68.5,-0.5 -68.5,-0.5 -0.26044,-44.96044 c -0.1701,-29.364 -0.62018,-45.32106 -1.29748,-46 -0.61887,-0.62038 -9.58642,-1.24117 -22.23955,-1.53956 l -21.20253,-0.5 -0.5,-44.20083 c -0.32035,-28.31979 -0.87003,-44.57056 -1.52988,-45.22989 -0.62605,-0.62554 -9.644729,-1.13497 -23.000009,-1.29916 l -21.97011,-0.27012 0,-46.49999 0,-46.500003 22.5,-0.5 22.499999,-0.5 0.5,-22.5 0.5,-22.500001 23,0 23,0 0.5,69.000001 0.5,68.999993 22.5,0 22.5,0 0.5,-68.999993 0.5,-69.000001 22.5,0 22.5,0 0,114.999994 0,115 -21.20253,0.5 c -13.06388,0.30807 -21.61243,0.91088 -22.27041,1.57041 -0.70812,0.7098 -0.97678,8.28986 -0.79747,22.5 l 0.27041,21.42959 43.93935,0.26065 c 29.90385,0.17739 44.27815,-0.0774 45,-0.79755 0.64951,-0.64801 1.25447,-9.47074 1.56065,-22.76065 l 0.5,-21.70245 21.20125,-0.5 c 15.49421,-0.36541 21.55085,-0.8496 22.5,-1.79875 0.94915,-0.94915 1.43334,-7.00579 1.79875,-22.5 l 0.5,-21.20125 21.4221,-0.27039 c 13.74507,-0.17349 21.89799,-0.66533 22.75,-1.37244 1.86497,-1.54779 1.93794,-42.34431 0.0779,-43.54815 -0.6875,-0.44496 -10.925,-1.03402 -22.75,-1.30902 l -21.5,-0.5 -0.26043,-44.93956 c -0.14323,-24.716769 0.0913,-45.291272 0.52112,-45.721122 0.42985,-0.42985 21.24704,-0.821311 46.26043,-0.869914 l 45.47888,-0.08837 0.5,68.309476 0.5,68.30949 45.5,0 45.5,0 0,-21.5 0,-21.5 -23,-0.5 -23,-0.5 0,-46.49999 0,-46.500005 46.5,0 46.5,0 0.25532,90.903935 c 0.1807,64.33897 0.57702,91.29158 1.35619,92.23042 0.83731,1.0089 6.16306,1.39102 22.24469,1.59606 l 21.1438,0.26958 0.5,21.70245 c 0.30615,13.2884 0.91117,22.11267 1.56054,22.76054 0.72197,0.7203 15.24754,0.97491 45.5,0.79755 l 44.43946,-0.26054 0.27041,-21.42959 c 0.17932,-14.2111 -0.0893,-21.79015 -0.79755,-22.5 -0.66039,-0.66191 -9.35028,-1.26123 -22.77041,-1.57041 l -21.70245,-0.5 -0.5,-44.20083 c -0.32022,-28.30803 -0.87016,-44.57069 -1.52947,-45.22947 -0.62361,-0.62311 -9.494,-1.13529 -22.5,-1.29917 l -21.47053,-0.27053 0,-46.49999 0,-46.500005 22,-0.5 22,-0.5 0.5,-22.5 0.5,-22.500001 23.5,0 23.5,0 0.5,69.000001 0.5,68.999995 22,0 22,0 0.5,-68.999995 0.5,-69.000001 23,0 23,0 0,115.499996 0,115.5 -22.5,0.5 -22.5,0.5 -0.5,45.5 -0.5,45.5 -68.5,0.5 -68.5,0.5 0,22 0,22 45.5,0.5 45.5,0.5 0.5,46 0.5,46 22.5,0.5 22.5,0.5 0,69 0,69 -23,0 -23,0 -0.25705,-67.95705 c -0.17172,-45.39696 -0.60248,-68.30329 -1.29755,-69 -0.62555,-0.62702 -9.69546,-1.24235 -22.74295,-1.54295 l -21.70245,-0.5 -0.27081,-20.92262 c -0.17312,-13.3749 -0.66822,-21.40146 -1.37245,-22.25 -1.53612,-1.85091 -133.80901,-1.97511 -135.65674,-0.12738 -0.9155,0.9155 -1.2,22.47577 -1.2,90.94098 0,49.35754 -0.36973,89.96949 -0.82162,90.24878 -0.45189,0.27928 -10.91439,0.58003 -23.25,0.66833 l -22.42838,0.16054 -0.5,-68.35931 -0.5,-68.35932 -22,0 -22,0 -0.5,68.5 -0.5,68.5 -22.77416,0.26884 c -17.67944,0.20869 -22.88111,-0.015 -23.25228,-1 z" - id="path3697" /> - <path - style="fill:#e4002b;fill-opacity:1" - d="m 567.13302,617.3174 c -0.2648,-0.69275 -0.36494,-31.85984 -0.22253,-69.25984 l 0.25892,-68 23,0 23,0 0.5,45 0.5,45 22,0.5 22,0.5 0,23.5 0,23.5 -45.27747,0.26021 c -35.68808,0.2051 -45.37943,-0.007 -45.75892,-1 z" - id="path2921" /> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1036.3622)"> + <a + id="a4396"> + <path + id="rect4446" + style="fill:#e4002b;fill-opacity:1" + d="m 2,1038.3619 0,3 1,0 0,-3 1,0 0,5 -1,0 0,1 2,0 0,-1 1,0 0,-1 1,0 0,-1 -1,0 0,-2 2,0 0,3 2,0 0,-1 -1,0 0,-2 2,0 0,3 0,1 1,0 0,1 2,0 0,-1 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 1,0 0,3 1,0 0,-3 1,0 0,4.9553 -1,0.045 0,2 -3,0 0,1 2,0 0,2 1,0 0,3 -1,0 0,-3 -0.983435,0 -0.01656,-1 -3,0 0,4 -1,0 0,-3 -1,0 0,3 -1,0 0,-4 -3,0 0,1 -1,0 0,3 -1,0 0,-3 1,0 0,-2 2,0 0,-1 -3,0 0,-2 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 z" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" /> + <a + id="a4960" + transform="translate(5e-6,1)"> + <path + transform="translate(0,1036.3622)" + style="fill:#e4002b;fill-opacity:1" + d="m 5,11 1,0 0,3 -2,0 0,-1 1,0 z" + id="rect5009" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + </a> + <a + transform="translate(7.000005,1)" + id="a4960-3"> + <path + transform="translate(0,1036.3622)" + style="fill:#e4002b;fill-opacity:1" + d="m 4,11 1,0 0,2 1,0 0,1 -2,0 z" + id="rect5009-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccc" /> + </a> + </a> + </g> </svg> diff --git a/cholerab/manifest b/cholerab/manifest index fca99561..1e7554b9 100644 --- a/cholerab/manifest +++ b/cholerab/manifest @@ -2,3 +2,8 @@ 1. Everything is compromised 2. Enterprise-patterns are FTW 3. When in doubt, do the right thing + +# Purpose of Krebs +1. Survive +2. Spread +3. Grow diff --git a/evan/Makefile b/evan/Makefile deleted file mode 100644 index f87e8505..00000000 --- a/evan/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.PHONY: infect -INSTALL_DIR = /root/bin -infect: - mkdir -p ${INSTALL_DIR} - cp evan ${INSTALL_DIR} - cp satz-liste ${INSTALL_DIR} - cp evan-startup /etc/init.d/evan - update-rc.d evan start - diff --git a/god/Eselkalk/README b/god/Eselkalk/README new file mode 100644 index 00000000..48294b8e --- /dev/null +++ b/god/Eselkalk/README @@ -0,0 +1,3 @@ +# Eselkalk + +Calculates the next 4 shack penum dates diff --git a/shack/Eselkalk/index.js b/god/Eselkalk/index.js index f64e0605..f64e0605 100644 --- a/shack/Eselkalk/index.js +++ b/god/Eselkalk/index.js diff --git a/Monitoring/collectd/collectd.conf b/god/Monitoring/collectd/collectd.conf index 8779f418..8779f418 100644 --- a/Monitoring/collectd/collectd.conf +++ b/god/Monitoring/collectd/collectd.conf diff --git a/Monitoring/collectd/supervisor.d/collectd.conf b/god/Monitoring/collectd/supervisor.d/collectd.conf index a6334d70..a6334d70 100644 --- a/Monitoring/collectd/supervisor.d/collectd.conf +++ b/god/Monitoring/collectd/supervisor.d/collectd.conf diff --git a/Monitoring/nagios/Makefile b/god/Monitoring/nagios/Makefile index 4730f30d..4730f30d 100644 --- a/Monitoring/nagios/Makefile +++ b/god/Monitoring/nagios/Makefile diff --git a/Monitoring/nagios/TODO b/god/Monitoring/nagios/TODO index e69de29b..e69de29b 100644 --- a/Monitoring/nagios/TODO +++ b/god/Monitoring/nagios/TODO diff --git a/Monitoring/nagios/conf/extinfo.cfg b/god/Monitoring/nagios/conf/extinfo.cfg index e4300b72..e4300b72 100644 --- a/Monitoring/nagios/conf/extinfo.cfg +++ b/god/Monitoring/nagios/conf/extinfo.cfg diff --git a/Monitoring/nagios/conf/hostgroups_generic.cfg b/god/Monitoring/nagios/conf/hostgroups_generic.cfg index 4e3625c5..4e3625c5 100644 --- a/Monitoring/nagios/conf/hostgroups_generic.cfg +++ b/god/Monitoring/nagios/conf/hostgroups_generic.cfg diff --git a/Monitoring/nagios/conf/krebs_hosts.cfg b/god/Monitoring/nagios/conf/krebs_hosts.cfg index a929fa19..a929fa19 100644 --- a/Monitoring/nagios/conf/krebs_hosts.cfg +++ b/god/Monitoring/nagios/conf/krebs_hosts.cfg diff --git a/Monitoring/nagios/conf/krebsnet.cfg b/god/Monitoring/nagios/conf/krebsnet.cfg index ae5b898e..ae5b898e 100644 --- a/Monitoring/nagios/conf/krebsnet.cfg +++ b/god/Monitoring/nagios/conf/krebsnet.cfg diff --git a/Monitoring/nagios/conf/localhost.cfg b/god/Monitoring/nagios/conf/localhost.cfg index 3b098195..3b098195 100644 --- a/Monitoring/nagios/conf/localhost.cfg +++ b/god/Monitoring/nagios/conf/localhost.cfg diff --git a/Monitoring/nagios/conf/other_hosts.cfg b/god/Monitoring/nagios/conf/other_hosts.cfg index bbdc676a..bbdc676a 100644 --- a/Monitoring/nagios/conf/other_hosts.cfg +++ b/god/Monitoring/nagios/conf/other_hosts.cfg diff --git a/Monitoring/nagios/conf/services.cfg b/god/Monitoring/nagios/conf/services.cfg index e3a61eb0..e3a61eb0 100644 --- a/Monitoring/nagios/conf/services.cfg +++ b/god/Monitoring/nagios/conf/services.cfg diff --git a/Monitoring/nagios/conf/shack_contacts.cfg b/god/Monitoring/nagios/conf/shack_contacts.cfg index 832a215e..832a215e 100644 --- a/Monitoring/nagios/conf/shack_contacts.cfg +++ b/god/Monitoring/nagios/conf/shack_contacts.cfg diff --git a/Monitoring/nagios/conf/shack_guests.cfg b/god/Monitoring/nagios/conf/shack_guests.cfg index 67abdfce..67abdfce 100644 --- a/Monitoring/nagios/conf/shack_guests.cfg +++ b/god/Monitoring/nagios/conf/shack_guests.cfg diff --git a/Monitoring/nagios/conf/shack_infrastructure.cfg b/god/Monitoring/nagios/conf/shack_infrastructure.cfg index f404f3e4..f404f3e4 100644 --- a/Monitoring/nagios/conf/shack_infrastructure.cfg +++ b/god/Monitoring/nagios/conf/shack_infrastructure.cfg diff --git a/Monitoring/nagios/conf/shacknet.cfg b/god/Monitoring/nagios/conf/shacknet.cfg index 802e5e3a..802e5e3a 100644 --- a/Monitoring/nagios/conf/shacknet.cfg +++ b/god/Monitoring/nagios/conf/shacknet.cfg diff --git a/Monitoring/nagios/conf/templates.cfg b/god/Monitoring/nagios/conf/templates.cfg index 41807e1c..41807e1c 100644 --- a/Monitoring/nagios/conf/templates.cfg +++ b/god/Monitoring/nagios/conf/templates.cfg diff --git a/Monitoring/nagios/conf/timeperiods.cfg b/god/Monitoring/nagios/conf/timeperiods.cfg index 55ecf9df..55ecf9df 100644 --- a/Monitoring/nagios/conf/timeperiods.cfg +++ b/god/Monitoring/nagios/conf/timeperiods.cfg diff --git a/Monitoring/nagios/conf/tinc_hosts.cfg b/god/Monitoring/nagios/conf/tinc_hosts.cfg index 717c75a8..717c75a8 100644 --- a/Monitoring/nagios/conf/tinc_hosts.cfg +++ b/god/Monitoring/nagios/conf/tinc_hosts.cfg diff --git a/Monitoring/nagios/conf/tincnet.cfg b/god/Monitoring/nagios/conf/tincnet.cfg index f0b35b4e..f0b35b4e 100644 --- a/Monitoring/nagios/conf/tincnet.cfg +++ b/god/Monitoring/nagios/conf/tincnet.cfg diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 b/god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 Binary files differindex 5e585c62..5e585c62 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2 diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png Binary files differindex 87200fe4..87200fe4 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico b/god/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico Binary files differindex fa18384c..fa18384c 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 b/god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 Binary files differindex 1113f03e..1113f03e 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2 diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png Binary files differindex 3c40512c..3c40512c 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 b/god/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 Binary files differindex 8b0d98e5..8b0d98e5 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2 diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/shack.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/shack.png Binary files differindex 53f1275b..53f1275b 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/shack.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/shack.png diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 b/god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 Binary files differindex 36572d4a..36572d4a 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2 diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png Binary files differindex daa1fdeb..daa1fdeb 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 Binary files differindex 6e740ec4..6e740ec4 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2 diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png Binary files differindex 9febe45e..9febe45e 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png diff --git a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png Binary files differindex fe9788af..fe9788af 100644 --- a/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png +++ b/god/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png diff --git a/Monitoring/nagios/htpasswd.users b/god/Monitoring/nagios/htpasswd.users index 7d4bbd6c..7d4bbd6c 100644 --- a/Monitoring/nagios/htpasswd.users +++ b/god/Monitoring/nagios/htpasswd.users diff --git a/Monitoring/nagios/plugins/check.bat b/god/Monitoring/nagios/plugins/check.bat index e69de29b..e69de29b 100755 --- a/Monitoring/nagios/plugins/check.bat +++ b/god/Monitoring/nagios/plugins/check.bat diff --git a/Monitoring/nagios/plugins/check.sh b/god/Monitoring/nagios/plugins/check.sh index 9e62fbee..9e62fbee 100755 --- a/Monitoring/nagios/plugins/check.sh +++ b/god/Monitoring/nagios/plugins/check.sh diff --git a/Monitoring/nagios/plugins/check_apt b/god/Monitoring/nagios/plugins/check_apt Binary files differindex 2371c32d..2371c32d 100755 --- a/Monitoring/nagios/plugins/check_apt +++ b/god/Monitoring/nagios/plugins/check_apt diff --git a/Monitoring/nagios/plugins/check_bgpstate b/god/Monitoring/nagios/plugins/check_bgpstate index 645d7505..645d7505 100755 --- a/Monitoring/nagios/plugins/check_bgpstate +++ b/god/Monitoring/nagios/plugins/check_bgpstate diff --git a/Monitoring/nagios/plugins/check_breeze b/god/Monitoring/nagios/plugins/check_breeze index d0382e69..d0382e69 100755 --- a/Monitoring/nagios/plugins/check_breeze +++ b/god/Monitoring/nagios/plugins/check_breeze diff --git a/Monitoring/nagios/plugins/check_btcguild_miner b/god/Monitoring/nagios/plugins/check_btcguild_miner index 2e6a8de3..2e6a8de3 100755 --- a/Monitoring/nagios/plugins/check_btcguild_miner +++ b/god/Monitoring/nagios/plugins/check_btcguild_miner diff --git a/Monitoring/nagios/plugins/check_by_ssh b/god/Monitoring/nagios/plugins/check_by_ssh Binary files differindex 5f969058..5f969058 100755 --- a/Monitoring/nagios/plugins/check_by_ssh +++ b/god/Monitoring/nagios/plugins/check_by_ssh diff --git a/Monitoring/nagios/plugins/check_clamd b/god/Monitoring/nagios/plugins/check_clamd index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_clamd +++ b/god/Monitoring/nagios/plugins/check_clamd diff --git a/Monitoring/nagios/plugins/check_cluster b/god/Monitoring/nagios/plugins/check_cluster Binary files differindex 8d6dbb90..8d6dbb90 100755 --- a/Monitoring/nagios/plugins/check_cluster +++ b/god/Monitoring/nagios/plugins/check_cluster diff --git a/Monitoring/nagios/plugins/check_cpu b/god/Monitoring/nagios/plugins/check_cpu index 26a93da5..26a93da5 100755 --- a/Monitoring/nagios/plugins/check_cpu +++ b/god/Monitoring/nagios/plugins/check_cpu diff --git a/Monitoring/nagios/plugins/check_dhcp b/god/Monitoring/nagios/plugins/check_dhcp Binary files differindex 6b51224f..6b51224f 100755 --- a/Monitoring/nagios/plugins/check_dhcp +++ b/god/Monitoring/nagios/plugins/check_dhcp diff --git a/Monitoring/nagios/plugins/check_dig b/god/Monitoring/nagios/plugins/check_dig Binary files differindex 650608dc..650608dc 100755 --- a/Monitoring/nagios/plugins/check_dig +++ b/god/Monitoring/nagios/plugins/check_dig diff --git a/Monitoring/nagios/plugins/check_disk b/god/Monitoring/nagios/plugins/check_disk Binary files differindex 43dc43a3..43dc43a3 100755 --- a/Monitoring/nagios/plugins/check_disk +++ b/god/Monitoring/nagios/plugins/check_disk diff --git a/Monitoring/nagios/plugins/check_disk_smb b/god/Monitoring/nagios/plugins/check_disk_smb index 80fa6779..80fa6779 100755 --- a/Monitoring/nagios/plugins/check_disk_smb +++ b/god/Monitoring/nagios/plugins/check_disk_smb diff --git a/Monitoring/nagios/plugins/check_dns b/god/Monitoring/nagios/plugins/check_dns Binary files differindex 8a80b991..8a80b991 100755 --- a/Monitoring/nagios/plugins/check_dns +++ b/god/Monitoring/nagios/plugins/check_dns diff --git a/Monitoring/nagios/plugins/check_dummy b/god/Monitoring/nagios/plugins/check_dummy Binary files differindex b66006ac..b66006ac 100755 --- a/Monitoring/nagios/plugins/check_dummy +++ b/god/Monitoring/nagios/plugins/check_dummy diff --git a/Monitoring/nagios/plugins/check_dummy.sh b/god/Monitoring/nagios/plugins/check_dummy.sh index fe834bd0..fe834bd0 100755 --- a/Monitoring/nagios/plugins/check_dummy.sh +++ b/god/Monitoring/nagios/plugins/check_dummy.sh diff --git a/Monitoring/nagios/plugins/check_file_age b/god/Monitoring/nagios/plugins/check_file_age index 7f20bad7..7f20bad7 100755 --- a/Monitoring/nagios/plugins/check_file_age +++ b/god/Monitoring/nagios/plugins/check_file_age diff --git a/Monitoring/nagios/plugins/check_flexlm b/god/Monitoring/nagios/plugins/check_flexlm index 532785ef..532785ef 100755 --- a/Monitoring/nagios/plugins/check_flexlm +++ b/god/Monitoring/nagios/plugins/check_flexlm diff --git a/Monitoring/nagios/plugins/check_fping b/god/Monitoring/nagios/plugins/check_fping Binary files differindex 3d2b16f9..3d2b16f9 100755 --- a/Monitoring/nagios/plugins/check_fping +++ b/god/Monitoring/nagios/plugins/check_fping diff --git a/Monitoring/nagios/plugins/check_ftp b/god/Monitoring/nagios/plugins/check_ftp index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_ftp +++ b/god/Monitoring/nagios/plugins/check_ftp diff --git a/Monitoring/nagios/plugins/check_game b/god/Monitoring/nagios/plugins/check_game Binary files differindex 68c4bda4..68c4bda4 100755 --- a/Monitoring/nagios/plugins/check_game +++ b/god/Monitoring/nagios/plugins/check_game diff --git a/Monitoring/nagios/plugins/check_host b/god/Monitoring/nagios/plugins/check_host index 97878096..97878096 120000 --- a/Monitoring/nagios/plugins/check_host +++ b/god/Monitoring/nagios/plugins/check_host diff --git a/Monitoring/nagios/plugins/check_hpjd b/god/Monitoring/nagios/plugins/check_hpjd Binary files differindex 75af60de..75af60de 100755 --- a/Monitoring/nagios/plugins/check_hpjd +++ b/god/Monitoring/nagios/plugins/check_hpjd diff --git a/Monitoring/nagios/plugins/check_http b/god/Monitoring/nagios/plugins/check_http Binary files differindex 2143dc6e..2143dc6e 100755 --- a/Monitoring/nagios/plugins/check_http +++ b/god/Monitoring/nagios/plugins/check_http diff --git a/Monitoring/nagios/plugins/check_icmp b/god/Monitoring/nagios/plugins/check_icmp Binary files differindex 3e43c4d6..3e43c4d6 100755 --- a/Monitoring/nagios/plugins/check_icmp +++ b/god/Monitoring/nagios/plugins/check_icmp diff --git a/Monitoring/nagios/plugins/check_ide_smart b/god/Monitoring/nagios/plugins/check_ide_smart Binary files differindex e52727f4..e52727f4 100755 --- a/Monitoring/nagios/plugins/check_ide_smart +++ b/god/Monitoring/nagios/plugins/check_ide_smart diff --git a/Monitoring/nagios/plugins/check_ifoperstatus b/god/Monitoring/nagios/plugins/check_ifoperstatus index 23b25d5d..23b25d5d 100755 --- a/Monitoring/nagios/plugins/check_ifoperstatus +++ b/god/Monitoring/nagios/plugins/check_ifoperstatus diff --git a/Monitoring/nagios/plugins/check_ifstatus b/god/Monitoring/nagios/plugins/check_ifstatus index b977675e..b977675e 100755 --- a/Monitoring/nagios/plugins/check_ifstatus +++ b/god/Monitoring/nagios/plugins/check_ifstatus diff --git a/Monitoring/nagios/plugins/check_imap b/god/Monitoring/nagios/plugins/check_imap index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_imap +++ b/god/Monitoring/nagios/plugins/check_imap diff --git a/Monitoring/nagios/plugins/check_ircd b/god/Monitoring/nagios/plugins/check_ircd index 21d367ed..21d367ed 100755 --- a/Monitoring/nagios/plugins/check_ircd +++ b/god/Monitoring/nagios/plugins/check_ircd diff --git a/Monitoring/nagios/plugins/check_jabber b/god/Monitoring/nagios/plugins/check_jabber index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_jabber +++ b/god/Monitoring/nagios/plugins/check_jabber diff --git a/Monitoring/nagios/plugins/check_ldap b/god/Monitoring/nagios/plugins/check_ldap Binary files differindex ea4e3346..ea4e3346 100755 --- a/Monitoring/nagios/plugins/check_ldap +++ b/god/Monitoring/nagios/plugins/check_ldap diff --git a/Monitoring/nagios/plugins/check_ldaps b/god/Monitoring/nagios/plugins/check_ldaps index 928c9e7c..928c9e7c 120000 --- a/Monitoring/nagios/plugins/check_ldaps +++ b/god/Monitoring/nagios/plugins/check_ldaps diff --git a/Monitoring/nagios/plugins/check_linux_raid b/god/Monitoring/nagios/plugins/check_linux_raid index ab982cd6..ab982cd6 100755 --- a/Monitoring/nagios/plugins/check_linux_raid +++ b/god/Monitoring/nagios/plugins/check_linux_raid diff --git a/Monitoring/nagios/plugins/check_load b/god/Monitoring/nagios/plugins/check_load Binary files differindex 8501ea65..8501ea65 100755 --- a/Monitoring/nagios/plugins/check_load +++ b/god/Monitoring/nagios/plugins/check_load diff --git a/Monitoring/nagios/plugins/check_log b/god/Monitoring/nagios/plugins/check_log index 4b60b5de..4b60b5de 100755 --- a/Monitoring/nagios/plugins/check_log +++ b/god/Monitoring/nagios/plugins/check_log diff --git a/Monitoring/nagios/plugins/check_mailq b/god/Monitoring/nagios/plugins/check_mailq index 01a147b9..01a147b9 100755 --- a/Monitoring/nagios/plugins/check_mailq +++ b/god/Monitoring/nagios/plugins/check_mailq diff --git a/Monitoring/nagios/plugins/check_mem.pl b/god/Monitoring/nagios/plugins/check_mem.pl index 99e2b1f7..99e2b1f7 100755 --- a/Monitoring/nagios/plugins/check_mem.pl +++ b/god/Monitoring/nagios/plugins/check_mem.pl diff --git a/Monitoring/nagios/plugins/check_mrtg b/god/Monitoring/nagios/plugins/check_mrtg Binary files differindex 33a912e6..33a912e6 100755 --- a/Monitoring/nagios/plugins/check_mrtg +++ b/god/Monitoring/nagios/plugins/check_mrtg diff --git a/Monitoring/nagios/plugins/check_mrtgtraf b/god/Monitoring/nagios/plugins/check_mrtgtraf Binary files differindex ca686d72..ca686d72 100755 --- a/Monitoring/nagios/plugins/check_mrtgtraf +++ b/god/Monitoring/nagios/plugins/check_mrtgtraf diff --git a/Monitoring/nagios/plugins/check_mysql b/god/Monitoring/nagios/plugins/check_mysql Binary files differindex 5dd232b2..5dd232b2 100755 --- a/Monitoring/nagios/plugins/check_mysql +++ b/god/Monitoring/nagios/plugins/check_mysql diff --git a/Monitoring/nagios/plugins/check_mysql_query b/god/Monitoring/nagios/plugins/check_mysql_query Binary files differindex c456440f..c456440f 100755 --- a/Monitoring/nagios/plugins/check_mysql_query +++ b/god/Monitoring/nagios/plugins/check_mysql_query diff --git a/Monitoring/nagios/plugins/check_nagios b/god/Monitoring/nagios/plugins/check_nagios Binary files differindex 4cb2614e..4cb2614e 100755 --- a/Monitoring/nagios/plugins/check_nagios +++ b/god/Monitoring/nagios/plugins/check_nagios diff --git a/Monitoring/nagios/plugins/check_nntp b/god/Monitoring/nagios/plugins/check_nntp index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_nntp +++ b/god/Monitoring/nagios/plugins/check_nntp diff --git a/Monitoring/nagios/plugins/check_nntps b/god/Monitoring/nagios/plugins/check_nntps index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_nntps +++ b/god/Monitoring/nagios/plugins/check_nntps diff --git a/Monitoring/nagios/plugins/check_nt b/god/Monitoring/nagios/plugins/check_nt Binary files differindex d1fd06e0..d1fd06e0 100755 --- a/Monitoring/nagios/plugins/check_nt +++ b/god/Monitoring/nagios/plugins/check_nt diff --git a/Monitoring/nagios/plugins/check_ntp b/god/Monitoring/nagios/plugins/check_ntp Binary files differindex 8fdc6857..8fdc6857 100755 --- a/Monitoring/nagios/plugins/check_ntp +++ b/god/Monitoring/nagios/plugins/check_ntp diff --git a/Monitoring/nagios/plugins/check_ntp_peer b/god/Monitoring/nagios/plugins/check_ntp_peer Binary files differindex 967b2a76..967b2a76 100755 --- a/Monitoring/nagios/plugins/check_ntp_peer +++ b/god/Monitoring/nagios/plugins/check_ntp_peer diff --git a/Monitoring/nagios/plugins/check_ntp_time b/god/Monitoring/nagios/plugins/check_ntp_time Binary files differindex e8a78e05..e8a78e05 100755 --- a/Monitoring/nagios/plugins/check_ntp_time +++ b/god/Monitoring/nagios/plugins/check_ntp_time diff --git a/Monitoring/nagios/plugins/check_nwstat b/god/Monitoring/nagios/plugins/check_nwstat Binary files differindex ad53275f..ad53275f 100755 --- a/Monitoring/nagios/plugins/check_nwstat +++ b/god/Monitoring/nagios/plugins/check_nwstat diff --git a/Monitoring/nagios/plugins/check_oracle b/god/Monitoring/nagios/plugins/check_oracle index 95cb68b6..95cb68b6 100755 --- a/Monitoring/nagios/plugins/check_oracle +++ b/god/Monitoring/nagios/plugins/check_oracle diff --git a/Monitoring/nagios/plugins/check_overcr b/god/Monitoring/nagios/plugins/check_overcr Binary files differindex d179627b..d179627b 100755 --- a/Monitoring/nagios/plugins/check_overcr +++ b/god/Monitoring/nagios/plugins/check_overcr diff --git a/Monitoring/nagios/plugins/check_pgsql b/god/Monitoring/nagios/plugins/check_pgsql Binary files differindex 0940a678..0940a678 100755 --- a/Monitoring/nagios/plugins/check_pgsql +++ b/god/Monitoring/nagios/plugins/check_pgsql diff --git a/Monitoring/nagios/plugins/check_ping b/god/Monitoring/nagios/plugins/check_ping Binary files differindex eac2e9a9..eac2e9a9 100755 --- a/Monitoring/nagios/plugins/check_ping +++ b/god/Monitoring/nagios/plugins/check_ping diff --git a/Monitoring/nagios/plugins/check_pop b/god/Monitoring/nagios/plugins/check_pop index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_pop +++ b/god/Monitoring/nagios/plugins/check_pop diff --git a/Monitoring/nagios/plugins/check_procs b/god/Monitoring/nagios/plugins/check_procs Binary files differindex 92c08b4a..92c08b4a 100755 --- a/Monitoring/nagios/plugins/check_procs +++ b/god/Monitoring/nagios/plugins/check_procs diff --git a/Monitoring/nagios/plugins/check_radius b/god/Monitoring/nagios/plugins/check_radius Binary files differindex 71253c3e..71253c3e 100755 --- a/Monitoring/nagios/plugins/check_radius +++ b/god/Monitoring/nagios/plugins/check_radius diff --git a/Monitoring/nagios/plugins/check_real b/god/Monitoring/nagios/plugins/check_real Binary files differindex 408fb8ff..408fb8ff 100755 --- a/Monitoring/nagios/plugins/check_real +++ b/god/Monitoring/nagios/plugins/check_real diff --git a/Monitoring/nagios/plugins/check_rpc b/god/Monitoring/nagios/plugins/check_rpc index 10a847ef..10a847ef 100755 --- a/Monitoring/nagios/plugins/check_rpc +++ b/god/Monitoring/nagios/plugins/check_rpc diff --git a/Monitoring/nagios/plugins/check_rta_multi b/god/Monitoring/nagios/plugins/check_rta_multi index 97878096..97878096 120000 --- a/Monitoring/nagios/plugins/check_rta_multi +++ b/god/Monitoring/nagios/plugins/check_rta_multi diff --git a/Monitoring/nagios/plugins/check_sensors b/god/Monitoring/nagios/plugins/check_sensors index 857a4d5a..857a4d5a 100755 --- a/Monitoring/nagios/plugins/check_sensors +++ b/god/Monitoring/nagios/plugins/check_sensors diff --git a/Monitoring/nagios/plugins/check_shinken.py b/god/Monitoring/nagios/plugins/check_shinken.py index a3827000..a3827000 100755 --- a/Monitoring/nagios/plugins/check_shinken.py +++ b/god/Monitoring/nagios/plugins/check_shinken.py diff --git a/Monitoring/nagios/plugins/check_simap b/god/Monitoring/nagios/plugins/check_simap index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_simap +++ b/god/Monitoring/nagios/plugins/check_simap diff --git a/Monitoring/nagios/plugins/check_sip b/god/Monitoring/nagios/plugins/check_sip index 24374727..24374727 100755 --- a/Monitoring/nagios/plugins/check_sip +++ b/god/Monitoring/nagios/plugins/check_sip diff --git a/Monitoring/nagios/plugins/check_smtp b/god/Monitoring/nagios/plugins/check_smtp Binary files differindex d70a48f0..d70a48f0 100755 --- a/Monitoring/nagios/plugins/check_smtp +++ b/god/Monitoring/nagios/plugins/check_smtp diff --git a/Monitoring/nagios/plugins/check_snmp b/god/Monitoring/nagios/plugins/check_snmp Binary files differindex d3fcd068..d3fcd068 100755 --- a/Monitoring/nagios/plugins/check_snmp +++ b/god/Monitoring/nagios/plugins/check_snmp diff --git a/Monitoring/nagios/plugins/check_speed b/god/Monitoring/nagios/plugins/check_speed index 14a5b612..14a5b612 100755 --- a/Monitoring/nagios/plugins/check_speed +++ b/god/Monitoring/nagios/plugins/check_speed diff --git a/Monitoring/nagios/plugins/check_spop b/god/Monitoring/nagios/plugins/check_spop index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_spop +++ b/god/Monitoring/nagios/plugins/check_spop diff --git a/Monitoring/nagios/plugins/check_ssh b/god/Monitoring/nagios/plugins/check_ssh Binary files differindex a9d69666..a9d69666 100755 --- a/Monitoring/nagios/plugins/check_ssh +++ b/god/Monitoring/nagios/plugins/check_ssh diff --git a/Monitoring/nagios/plugins/check_ssmtp b/god/Monitoring/nagios/plugins/check_ssmtp index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_ssmtp +++ b/god/Monitoring/nagios/plugins/check_ssmtp diff --git a/Monitoring/nagios/plugins/check_swap b/god/Monitoring/nagios/plugins/check_swap Binary files differindex 6015a7a2..6015a7a2 100755 --- a/Monitoring/nagios/plugins/check_swap +++ b/god/Monitoring/nagios/plugins/check_swap diff --git a/Monitoring/nagios/plugins/check_tcp b/god/Monitoring/nagios/plugins/check_tcp Binary files differindex b084eda3..b084eda3 100755 --- a/Monitoring/nagios/plugins/check_tcp +++ b/god/Monitoring/nagios/plugins/check_tcp diff --git a/Monitoring/nagios/plugins/check_temper b/god/Monitoring/nagios/plugins/check_temper index 95191026..95191026 100755 --- a/Monitoring/nagios/plugins/check_temper +++ b/god/Monitoring/nagios/plugins/check_temper diff --git a/Monitoring/nagios/plugins/check_time b/god/Monitoring/nagios/plugins/check_time Binary files differindex 73a12209..73a12209 100755 --- a/Monitoring/nagios/plugins/check_time +++ b/god/Monitoring/nagios/plugins/check_time diff --git a/Monitoring/nagios/plugins/check_udp b/god/Monitoring/nagios/plugins/check_udp index e838da97..e838da97 120000 --- a/Monitoring/nagios/plugins/check_udp +++ b/god/Monitoring/nagios/plugins/check_udp diff --git a/Monitoring/nagios/plugins/check_ups b/god/Monitoring/nagios/plugins/check_ups Binary files differindex cf641a5f..cf641a5f 100755 --- a/Monitoring/nagios/plugins/check_ups +++ b/god/Monitoring/nagios/plugins/check_ups diff --git a/Monitoring/nagios/plugins/check_users b/god/Monitoring/nagios/plugins/check_users Binary files differindex a0617fd4..a0617fd4 100755 --- a/Monitoring/nagios/plugins/check_users +++ b/god/Monitoring/nagios/plugins/check_users diff --git a/Monitoring/nagios/plugins/check_wave b/god/Monitoring/nagios/plugins/check_wave index efef4680..efef4680 100755 --- a/Monitoring/nagios/plugins/check_wave +++ b/god/Monitoring/nagios/plugins/check_wave diff --git a/Monitoring/nagios/plugins/getwmic.sh b/god/Monitoring/nagios/plugins/getwmic.sh index 05ba8f21..05ba8f21 100755 --- a/Monitoring/nagios/plugins/getwmic.sh +++ b/god/Monitoring/nagios/plugins/getwmic.sh diff --git a/Monitoring/nagios/plugins/link_vmware_host_vm.py b/god/Monitoring/nagios/plugins/link_vmware_host_vm.py index b64cefa8..b64cefa8 100755 --- a/Monitoring/nagios/plugins/link_vmware_host_vm.py +++ b/god/Monitoring/nagios/plugins/link_vmware_host_vm.py diff --git a/Monitoring/nagios/plugins/negate b/god/Monitoring/nagios/plugins/negate Binary files differindex 5bfacfaa..5bfacfaa 100755 --- a/Monitoring/nagios/plugins/negate +++ b/god/Monitoring/nagios/plugins/negate diff --git a/Monitoring/nagios/plugins/nmap_discovery_runner.py b/god/Monitoring/nagios/plugins/nmap_discovery_runner.py index 338e211f..338e211f 100755 --- a/Monitoring/nagios/plugins/nmap_discovery_runner.py +++ b/god/Monitoring/nagios/plugins/nmap_discovery_runner.py diff --git a/Monitoring/nagios/plugins/notify.sh b/god/Monitoring/nagios/plugins/notify.sh index 0c88305c..0c88305c 100755 --- a/Monitoring/nagios/plugins/notify.sh +++ b/god/Monitoring/nagios/plugins/notify.sh diff --git a/Monitoring/nagios/plugins/notify_irc b/god/Monitoring/nagios/plugins/notify_irc index e1de0866..e1de0866 100755 --- a/Monitoring/nagios/plugins/notify_irc +++ b/god/Monitoring/nagios/plugins/notify_irc diff --git a/Monitoring/nagios/plugins/nsca_client.py b/god/Monitoring/nagios/plugins/nsca_client.py index 76e551db..76e551db 100755 --- a/Monitoring/nagios/plugins/nsca_client.py +++ b/god/Monitoring/nagios/plugins/nsca_client.py diff --git a/Monitoring/nagios/plugins/sendmailhost.pl b/god/Monitoring/nagios/plugins/sendmailhost.pl index 51e85670..51e85670 100755 --- a/Monitoring/nagios/plugins/sendmailhost.pl +++ b/god/Monitoring/nagios/plugins/sendmailhost.pl diff --git a/Monitoring/nagios/plugins/sendmailservices.pl b/god/Monitoring/nagios/plugins/sendmailservices.pl index ab5464cf..ab5464cf 100755 --- a/Monitoring/nagios/plugins/sendmailservices.pl +++ b/god/Monitoring/nagios/plugins/sendmailservices.pl diff --git a/Monitoring/nagios/plugins/urlize b/god/Monitoring/nagios/plugins/urlize Binary files differindex 119be020..119be020 100755 --- a/Monitoring/nagios/plugins/urlize +++ b/god/Monitoring/nagios/plugins/urlize diff --git a/Monitoring/nagios/plugins/utils.pm b/god/Monitoring/nagios/plugins/utils.pm index 676a06fe..676a06fe 100644 --- a/Monitoring/nagios/plugins/utils.pm +++ b/god/Monitoring/nagios/plugins/utils.pm diff --git a/Monitoring/nagios/plugins/utils.sh b/god/Monitoring/nagios/plugins/utils.sh index 299a5e52..299a5e52 100755 --- a/Monitoring/nagios/plugins/utils.sh +++ b/god/Monitoring/nagios/plugins/utils.sh diff --git a/Monitoring/nagios/plugins/vmware_discovery_runner.py b/god/Monitoring/nagios/plugins/vmware_discovery_runner.py index 3a17c765..3a17c765 100755 --- a/Monitoring/nagios/plugins/vmware_discovery_runner.py +++ b/god/Monitoring/nagios/plugins/vmware_discovery_runner.py diff --git a/Monitoring/nagios/shinken/brokerd-windows.ini b/god/Monitoring/nagios/shinken/brokerd-windows.ini index 12ea6d24..12ea6d24 100644 --- a/Monitoring/nagios/shinken/brokerd-windows.ini +++ b/god/Monitoring/nagios/shinken/brokerd-windows.ini diff --git a/Monitoring/nagios/shinken/brokerd.ini b/god/Monitoring/nagios/shinken/brokerd.ini index baf0b773..baf0b773 100644 --- a/Monitoring/nagios/shinken/brokerd.ini +++ b/god/Monitoring/nagios/shinken/brokerd.ini diff --git a/Monitoring/nagios/shinken/certs/ca.pem b/god/Monitoring/nagios/shinken/certs/ca.pem index bae94d13..bae94d13 100755 --- a/Monitoring/nagios/shinken/certs/ca.pem +++ b/god/Monitoring/nagios/shinken/certs/ca.pem diff --git a/Monitoring/nagios/shinken/certs/client.pem b/god/Monitoring/nagios/shinken/certs/client.pem index 28c2019e..28c2019e 100755 --- a/Monitoring/nagios/shinken/certs/client.pem +++ b/god/Monitoring/nagios/shinken/certs/client.pem diff --git a/Monitoring/nagios/shinken/certs/server.pem b/god/Monitoring/nagios/shinken/certs/server.pem index 28c2019e..28c2019e 100644 --- a/Monitoring/nagios/shinken/certs/server.pem +++ b/god/Monitoring/nagios/shinken/certs/server.pem diff --git a/Monitoring/nagios/shinken/commands.cfg b/god/Monitoring/nagios/shinken/commands.cfg index 79a5e6e0..79a5e6e0 100644 --- a/Monitoring/nagios/shinken/commands.cfg +++ b/god/Monitoring/nagios/shinken/commands.cfg diff --git a/Monitoring/nagios/shinken/contactgroups.cfg b/god/Monitoring/nagios/shinken/contactgroups.cfg index 517f9ead..517f9ead 100644 --- a/Monitoring/nagios/shinken/contactgroups.cfg +++ b/god/Monitoring/nagios/shinken/contactgroups.cfg diff --git a/Monitoring/nagios/shinken/contacts.cfg b/god/Monitoring/nagios/shinken/contacts.cfg index 9a2f9bac..9a2f9bac 100644 --- a/Monitoring/nagios/shinken/contacts.cfg +++ b/god/Monitoring/nagios/shinken/contacts.cfg diff --git a/Monitoring/nagios/shinken/dependencies.cfg b/god/Monitoring/nagios/shinken/dependencies.cfg index 2a2c7449..2a2c7449 100644 --- a/Monitoring/nagios/shinken/dependencies.cfg +++ b/god/Monitoring/nagios/shinken/dependencies.cfg diff --git a/Monitoring/nagios/shinken/discovery.cfg b/god/Monitoring/nagios/shinken/discovery.cfg index d8e9fa9f..d8e9fa9f 100644 --- a/Monitoring/nagios/shinken/discovery.cfg +++ b/god/Monitoring/nagios/shinken/discovery.cfg diff --git a/Monitoring/nagios/shinken/discovery_rules.cfg b/god/Monitoring/nagios/shinken/discovery_rules.cfg index cb3f5c31..cb3f5c31 100644 --- a/Monitoring/nagios/shinken/discovery_rules.cfg +++ b/god/Monitoring/nagios/shinken/discovery_rules.cfg diff --git a/Monitoring/nagios/shinken/discovery_runs.cfg b/god/Monitoring/nagios/shinken/discovery_runs.cfg index d21b0c51..d21b0c51 100644 --- a/Monitoring/nagios/shinken/discovery_runs.cfg +++ b/god/Monitoring/nagios/shinken/discovery_runs.cfg diff --git a/Monitoring/nagios/shinken/escalations.cfg b/god/Monitoring/nagios/shinken/escalations.cfg index a953d871..a953d871 100644 --- a/Monitoring/nagios/shinken/escalations.cfg +++ b/god/Monitoring/nagios/shinken/escalations.cfg diff --git a/Monitoring/nagios/shinken/hostgroups.cfg b/god/Monitoring/nagios/shinken/hostgroups.cfg index fb8713b7..fb8713b7 100644 --- a/Monitoring/nagios/shinken/hostgroups.cfg +++ b/god/Monitoring/nagios/shinken/hostgroups.cfg diff --git a/Monitoring/nagios/shinken/hosts/localhost.cfg b/god/Monitoring/nagios/shinken/hosts/localhost.cfg index a15a9c5d..a15a9c5d 100644 --- a/Monitoring/nagios/shinken/hosts/localhost.cfg +++ b/god/Monitoring/nagios/shinken/hosts/localhost.cfg diff --git a/Monitoring/nagios/shinken/nagios-windows.cfg b/god/Monitoring/nagios/shinken/nagios-windows.cfg index 478d3950..478d3950 100644 --- a/Monitoring/nagios/shinken/nagios-windows.cfg +++ b/god/Monitoring/nagios/shinken/nagios-windows.cfg diff --git a/Monitoring/nagios/shinken/nagios.cfg b/god/Monitoring/nagios/shinken/nagios.cfg index 28d6b88d..28d6b88d 100644 --- a/Monitoring/nagios/shinken/nagios.cfg +++ b/god/Monitoring/nagios/shinken/nagios.cfg diff --git a/Monitoring/nagios/shinken/objects/groups/root_contact.cfg b/god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg index a2c4180a..a2c4180a 100644 --- a/Monitoring/nagios/shinken/objects/groups/root_contact.cfg +++ b/god/Monitoring/nagios/shinken/objects/groups/root_contact.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg index 8701cabc..8701cabc 100644 --- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg index a1303fec..a1303fec 100644 --- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg index 0e9de77f..0e9de77f 100644 --- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg b/god/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg index bd577394..bd577394 100644 --- a/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg b/god/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg index 3804a0d7..3804a0d7 100644 --- a/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg b/god/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg index 2bdc664e..2bdc664e 100644 --- a/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg b/god/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg index d903b730..d903b730 100644 --- a/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg index b7b89e51..b7b89e51 100644 --- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg index d3b07e1a..d3b07e1a 100644 --- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg index 11f82410..11f82410 100644 --- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg index 747c17cf..747c17cf 100644 --- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg index 953ad45e..953ad45e 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg index b09f34c2..b09f34c2 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg index 490d1410..490d1410 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg index f92e1951..f92e1951 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg index c9afcef9..c9afcef9 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg index a96aefad..a96aefad 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg index b70b0e98..b70b0e98 100644 --- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg +++ b/god/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg diff --git a/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg index de2bc56d..de2bc56d 100644 --- a/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg index 213e9d23..213e9d23 100644 --- a/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg +++ b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg diff --git a/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg index 72b211b4..72b211b4 100644 --- a/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg index c3c537b8..c3c537b8 100644 --- a/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg +++ b/god/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg index 1ebc589c..1ebc589c 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg index 47064f61..47064f61 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg index 19333936..19333936 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg index a55221dd..a55221dd 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg index 619bd6e2..619bd6e2 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg index e5a59a81..e5a59a81 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg index 59006c55..59006c55 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg index dc16615a..dc16615a 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg index 50f1dc61..50f1dc61 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg index 39804385..39804385 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg index 83b9ca97..83b9ca97 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg index 2a65e2fa..2a65e2fa 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg index a7f2d5f5..a7f2d5f5 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg index 99d2e724..99d2e724 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg index b46915dd..b46915dd 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg index 3a489402..3a489402 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg index 94c71033..94c71033 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg index 4fec2042..4fec2042 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg index 85b57629..85b57629 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg index aa756a5f..aa756a5f 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg index 12e65611..12e65611 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg index e3be8ce1..e3be8ce1 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg index 697e5b5a..697e5b5a 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg index 55b152e1..55b152e1 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg index cb1769a4..cb1769a4 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg index c1ca0f82..c1ca0f82 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg index 25db441f..25db441f 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg index 5982bb7c..5982bb7c 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg index a8cde1f7..a8cde1f7 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg index 4ec14ec2..4ec14ec2 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg index e07f5e57..e07f5e57 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg index e4c245d9..e4c245d9 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg index c5d0fa5e..c5d0fa5e 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg index 1c25a20e..1c25a20e 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg index d2e6802c..d2e6802c 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg index b22fb16d..b22fb16d 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg index 65ac9897..65ac9897 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg index f0cdcdd2..f0cdcdd2 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg index d27d74b3..d27d74b3 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg index 9ea51887..9ea51887 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg index 4f143bad..4f143bad 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg index 725cebd5..725cebd5 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg index 3f8b2b2f..3f8b2b2f 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg index e1fae603..e1fae603 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg index e7fe0113..e7fe0113 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg index 57dc32ba..57dc32ba 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg index 544a1d1e..544a1d1e 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg index 121c1aa1..121c1aa1 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg index b50df34c..b50df34c 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg index e5858f27..e5858f27 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg index 3d8f832d..3d8f832d 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg index eb42c69c..eb42c69c 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg index ef9a6411..ef9a6411 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg index 991487d4..991487d4 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg index 2d12f2d7..2d12f2d7 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg index 3f80764f..3f80764f 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg index 47eca686..47eca686 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg index 1cc9007e..1cc9007e 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg index f6965c14..f6965c14 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg index e602e163..e602e163 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg index db54258a..db54258a 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg index e75b1281..e75b1281 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg index 0b7cbf05..0b7cbf05 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg index b5e17567..b5e17567 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg index 618d5dd8..618d5dd8 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg index c1560569..c1560569 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg index 3324e3da..3324e3da 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg index bc8adfce..bc8adfce 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg index 4a4cf823..4a4cf823 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg index 17cd20a9..17cd20a9 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg diff --git a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg index 5ea44b7a..5ea44b7a 100644 --- a/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg +++ b/god/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg diff --git a/Monitoring/nagios/shinken/pollerd-windows.ini b/god/Monitoring/nagios/shinken/pollerd-windows.ini index 78b34788..78b34788 100644 --- a/Monitoring/nagios/shinken/pollerd-windows.ini +++ b/god/Monitoring/nagios/shinken/pollerd-windows.ini diff --git a/Monitoring/nagios/shinken/pollerd.ini b/god/Monitoring/nagios/shinken/pollerd.ini index a0c66043..a0c66043 100644 --- a/Monitoring/nagios/shinken/pollerd.ini +++ b/god/Monitoring/nagios/shinken/pollerd.ini diff --git a/Monitoring/nagios/shinken/reactionnerd-windows.ini b/god/Monitoring/nagios/shinken/reactionnerd-windows.ini index 36e147b4..36e147b4 100644 --- a/Monitoring/nagios/shinken/reactionnerd-windows.ini +++ b/god/Monitoring/nagios/shinken/reactionnerd-windows.ini diff --git a/Monitoring/nagios/shinken/reactionnerd.ini b/god/Monitoring/nagios/shinken/reactionnerd.ini index 0226e8e1..0226e8e1 100644 --- a/Monitoring/nagios/shinken/reactionnerd.ini +++ b/god/Monitoring/nagios/shinken/reactionnerd.ini diff --git a/Monitoring/nagios/shinken/receiverd-windows.ini b/god/Monitoring/nagios/shinken/receiverd-windows.ini index 6a0933d6..6a0933d6 100644 --- a/Monitoring/nagios/shinken/receiverd-windows.ini +++ b/god/Monitoring/nagios/shinken/receiverd-windows.ini diff --git a/Monitoring/nagios/shinken/receiverd.ini b/god/Monitoring/nagios/shinken/receiverd.ini index 29ef9f0e..29ef9f0e 100644 --- a/Monitoring/nagios/shinken/receiverd.ini +++ b/god/Monitoring/nagios/shinken/receiverd.ini diff --git a/Monitoring/nagios/shinken/resource.cfg b/god/Monitoring/nagios/shinken/resource.cfg index 675674c8..675674c8 100644 --- a/Monitoring/nagios/shinken/resource.cfg +++ b/god/Monitoring/nagios/shinken/resource.cfg diff --git a/Monitoring/nagios/shinken/schedulerd-windows.ini b/god/Monitoring/nagios/shinken/schedulerd-windows.ini index ff4283c7..ff4283c7 100644 --- a/Monitoring/nagios/shinken/schedulerd-windows.ini +++ b/god/Monitoring/nagios/shinken/schedulerd-windows.ini diff --git a/Monitoring/nagios/shinken/schedulerd.ini b/god/Monitoring/nagios/shinken/schedulerd.ini index a0cb8ab2..a0cb8ab2 100644 --- a/Monitoring/nagios/shinken/schedulerd.ini +++ b/god/Monitoring/nagios/shinken/schedulerd.ini diff --git a/Monitoring/nagios/shinken/servicegroups.cfg b/god/Monitoring/nagios/shinken/servicegroups.cfg index 256ed0aa..256ed0aa 100644 --- a/Monitoring/nagios/shinken/servicegroups.cfg +++ b/god/Monitoring/nagios/shinken/servicegroups.cfg diff --git a/Monitoring/nagios/shinken/services/linux_local.cfg b/god/Monitoring/nagios/shinken/services/linux_local.cfg index 7d0f52ef..7d0f52ef 100644 --- a/Monitoring/nagios/shinken/services/linux_local.cfg +++ b/god/Monitoring/nagios/shinken/services/linux_local.cfg diff --git a/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg b/god/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg index f8c6001d..f8c6001d 100644 --- a/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg +++ b/god/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg diff --git a/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg b/god/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg index e7f756d5..e7f756d5 100644 --- a/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg +++ b/god/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg diff --git a/Monitoring/nagios/shinken/shinken-specific.cfg b/god/Monitoring/nagios/shinken/shinken-specific.cfg index b21c619a..b21c619a 100644 --- a/Monitoring/nagios/shinken/shinken-specific.cfg +++ b/god/Monitoring/nagios/shinken/shinken-specific.cfg diff --git a/Monitoring/nagios/shinken/templates.cfg b/god/Monitoring/nagios/shinken/templates.cfg index 02cf1617..02cf1617 100644 --- a/Monitoring/nagios/shinken/templates.cfg +++ b/god/Monitoring/nagios/shinken/templates.cfg diff --git a/Monitoring/nagios/shinken/timeperiods.cfg b/god/Monitoring/nagios/shinken/timeperiods.cfg index 7322827d..7322827d 100644 --- a/Monitoring/nagios/shinken/timeperiods.cfg +++ b/god/Monitoring/nagios/shinken/timeperiods.cfg diff --git a/census/Makefile b/god/census/Makefile index 9993bf2a..9993bf2a 100644 --- a/census/Makefile +++ b/god/census/Makefile diff --git a/census/README.md b/god/census/README.md index 2842368d..2842368d 100644 --- a/census/README.md +++ b/god/census/README.md diff --git a/census/TODO.md b/god/census/TODO.md index daacfd58..daacfd58 100644 --- a/census/TODO.md +++ b/god/census/TODO.md diff --git a/census/VERSION b/god/census/VERSION index 6c50e659..6c50e659 100644 --- a/census/VERSION +++ b/god/census/VERSION diff --git a/census/arping.py b/god/census/arping.py index ed257441..ed257441 100755 --- a/census/arping.py +++ b/god/census/arping.py diff --git a/census/arping_users.py b/god/census/arping_users.py index eb47f308..eb47f308 100755 --- a/census/arping_users.py +++ b/god/census/arping_users.py diff --git a/census/mac_names.lst b/god/census/mac_names.lst index 5f123dbe..5f123dbe 100644 --- a/census/mac_names.lst +++ b/god/census/mac_names.lst diff --git a/census/sched-arping b/god/census/sched-arping index 14f8af3c..14f8af3c 100755 --- a/census/sched-arping +++ b/god/census/sched-arping diff --git a/census/title.lst b/god/census/title.lst index dade858f..dade858f 100644 --- a/census/title.lst +++ b/god/census/title.lst diff --git a/claws/.gitignore b/god/claws/.gitignore index 5da5924f..5da5924f 100644 --- a/claws/.gitignore +++ b/god/claws/.gitignore diff --git a/claws/Makefile b/god/claws/Makefile index abfae5eb..abfae5eb 100644 --- a/claws/Makefile +++ b/god/claws/Makefile diff --git a/god/claws/README.md b/god/claws/README.md new file mode 100644 index 00000000..00c90a85 --- /dev/null +++ b/god/claws/README.md @@ -0,0 +1,12 @@ +# CLAWS + +Claws is a tool to manage some obscure Hardware Relay Board currently attached +to the krebs infrastructure + +# Installation + + make install + +# Usage + + rcontrol --help diff --git a/claws/communication.h b/god/claws/communication.h index db4b2c36..db4b2c36 100644 --- a/claws/communication.h +++ b/god/claws/communication.h diff --git a/claws/rcontrol.c b/god/claws/rcontrol.c index 972c97d0..972c97d0 100644 --- a/claws/rcontrol.c +++ b/god/claws/rcontrol.c diff --git a/filebitch/COPYING b/god/filebitch/COPYING index 65d1a2e9..65d1a2e9 100644 --- a/filebitch/COPYING +++ b/god/filebitch/COPYING diff --git a/filebitch/README b/god/filebitch/README index 5ae3a666..5ae3a666 100644 --- a/filebitch/README +++ b/god/filebitch/README diff --git a/filebitch/TODO b/god/filebitch/TODO index aa2af36a..aa2af36a 100644 --- a/filebitch/TODO +++ b/god/filebitch/TODO diff --git a/filebitch/connect_narf.pl b/god/filebitch/connect_narf.pl index 7c713d3b..7c713d3b 100755 --- a/filebitch/connect_narf.pl +++ b/god/filebitch/connect_narf.pl diff --git a/filebitch/disconnect_narf.pl b/god/filebitch/disconnect_narf.pl index 77fbf743..77fbf743 100755 --- a/filebitch/disconnect_narf.pl +++ b/god/filebitch/disconnect_narf.pl diff --git a/icecrab/Makefile b/god/icecrab/Makefile index 36e91b76..36e91b76 100644 --- a/icecrab/Makefile +++ b/god/icecrab/Makefile diff --git a/icecrab/icecast.xml b/god/icecrab/icecast.xml index 7776dc36..7776dc36 100644 --- a/icecrab/icecast.xml +++ b/god/icecrab/icecast.xml diff --git a/icecrab/icecast2.conf b/god/icecrab/icecast2.conf index 3a2521ff..3a2521ff 100644 --- a/icecrab/icecast2.conf +++ b/god/icecrab/icecast2.conf diff --git a/god/ivan/Makefile b/god/ivan/Makefile new file mode 100644 index 00000000..38eb1da2 --- /dev/null +++ b/god/ivan/Makefile @@ -0,0 +1,7 @@ +.PHONY: infest +BIN_DIR = ../bin +infest: + cp ivan ${INSTALL_DIR} +debian-startup: + cp ivan-startup /etc/init.d/ivan + update-rc.d evan start diff --git a/evan/evan b/god/ivan/ivan index 608ac6b8..5099114a 100755 --- a/evan/evan +++ b/god/ivan/ivan @@ -1,5 +1,5 @@ #!/bin/bash -SATZ_LISTE=/krebs/evan/satz-liste +SATZ_LISTE=/krebs/ivan/satz-liste p="${noise_pitch-10}" v="${noise_lang-de}" k="${noise_capital-0}" diff --git a/evan/evan-startup b/god/ivan/ivan-startup index 8a7f8daa..8a7f8daa 100755 --- a/evan/evan-startup +++ b/god/ivan/ivan-startup diff --git a/evan/satz-liste b/god/ivan/satz-liste index 44f84c13..44f84c13 100644 --- a/evan/satz-liste +++ b/god/ivan/satz-liste diff --git a/kachelmann/.gitignore b/god/kachelmann/.gitignore index 050dfb2e..050dfb2e 100644 --- a/kachelmann/.gitignore +++ b/god/kachelmann/.gitignore diff --git a/kachelmann/Makefile b/god/kachelmann/Makefile index 3343d941..3343d941 100644 --- a/kachelmann/Makefile +++ b/god/kachelmann/Makefile diff --git a/kachelmann/wetter b/god/kachelmann/wetter index 957e13e2..957e13e2 100755 --- a/kachelmann/wetter +++ b/god/kachelmann/wetter diff --git a/meinsack/index b/god/meinsack/index index 7046d78c..7046d78c 100755 --- a/meinsack/index +++ b/god/meinsack/index diff --git a/shack/meinsack/index b/god/meinsack/shack-sack index 7d7147b2..9c61aeb5 100755 --- a/shack/meinsack/index +++ b/god/meinsack/shack-sack @@ -1,8 +1,8 @@ #! /bin/sh set -euf -cd $(dirname $(readlink -f $0))/../.. # cd // +cd $(dirname $(readlink -f $0)) export plz=70327 export str=Ulmer export ort=Wangen -exec meinsack/index +exec index diff --git a/god/streams/.gitignore b/god/streams/.gitignore new file mode 100644 index 00000000..0d20b648 --- /dev/null +++ b/god/streams/.gitignore @@ -0,0 +1 @@ +*.pyc diff --git a/streams/Makefile b/god/streams/Makefile index ab5d1429..2d0056f4 100644 --- a/streams/Makefile +++ b/god/streams/Makefile @@ -4,10 +4,10 @@ streams = $(shell cut -d\ -f2 stream.db) CURRDIR = ${PWD} .PHONY: all $(streams) -local: ../bin/streams +local: ../../bin/streams -../bin/streams: - ln -sf $$PWD/streams ../bin/streams +../../bin/streams: + ln -sf $$PWD/bin/streams ../../bin/streams all: $(streams) @update-rc.d groove defaults 2>/dev/null || echo "[31;1m**[31;1;5m put groove daemon in DAEMONS in /etc/rc.conf[m" diff --git a/god/streams/README.md b/god/streams/README.md new file mode 100644 index 00000000..cc763ede --- /dev/null +++ b/god/streams/README.md @@ -0,0 +1,38 @@ +# streams done right(tm) + +There are numerous ways to start streams ( make your computer or some server +output streamed audio). Currently implemented are: + +# Streams Modules +1. pure streams - will start mpd on your local machine +2. mpdstreams - will use a given mpd server to start a stream +3. relaxxstreams - will contact the relaxxplayer (mpd front-end) if the direct + connection to the mpd is prohibited by firewall rules +# Database +Currently there are a number of possible streams saved in the database files +which contain of a link, a space, and the name of the stream. the database +can be found in db/ . + +Currently there are two kinds of databases: +1. streams.db - contains links to playlists of streams +2. direct.db - contains links directly to the stream, not the playlist + +to generate direct.db from a list of playlists use the helper/* scripts + +# initscripts + +the most convenient way to start streams is to use stream-starter which is +a script which, when symlinked with a name of a stream, invokes the streams +tool with its own name as parameter. + +An example: + + ln -s /krebs/god/streams/bin/stream-starter /etc/init.d/groove + /etc/init.d/groove start + +# Remarks +deepmix,groovesalad and radiotux are now init.d scrips which can be +started and stopped. + +scripts are dumped into /etc/init.d and groovesalad will be set as +default via update-rc.d diff --git a/god/streams/bin/helper/streamfind b/god/streams/bin/helper/streamfind new file mode 100644 index 00000000..32b84a4e --- /dev/null +++ b/god/streams/bin/helper/streamfind @@ -0,0 +1,10 @@ +#!/bin/sh +cat stream.db | while read url name;do + curl $url --max-time 1 2>/dev/null| sed -n 's/[fF]ile[0-9]=\(.*\)/\1/p' > "streamfinder/$name" + if [ "x`cat \"streamfinder/$name\"`" == "x" ];then + rm "streamfinder/$name" + echo "$name empty or not a stream" + else + echo "wrote $name" + fi +done diff --git a/god/streams/bin/helper/streamwrite b/god/streams/bin/helper/streamwrite new file mode 100644 index 00000000..a10fb155 --- /dev/null +++ b/god/streams/bin/helper/streamwrite @@ -0,0 +1,6 @@ +for i in `ls -1 streamfinder/`; +do + for j in `cat "$i"`;do + echo "$j $i" >> direct.db + done +done diff --git a/streams/mpdstreams b/god/streams/bin/mpdstreams index d9132937..a2a5f77c 100755 --- a/streams/mpdstreams +++ b/god/streams/bin/mpdstreams @@ -8,9 +8,8 @@ from subprocess import Popen, PIPE os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) pidfile = "/tmp/krebs.stream.pid" host="lounge.mpd.shack" -url_file = os.environ.get("STREAM_DB", "stream.db") +url_file = os.environ.get("STREAM_DB", "../db/stream.db") urls = [] -#urls = [ url,f for (url,f) in open(url_file).readline() ] for line in open(url_file): urls.append(line.split()) #print urls diff --git a/streams/relaxxapi.py b/god/streams/bin/relaxxapi.py index f367caef..f367caef 100755 --- a/streams/relaxxapi.py +++ b/god/streams/bin/relaxxapi.py diff --git a/streams/relaxxstreams b/god/streams/bin/relaxxstreams index 57cfb05b..0d3813a7 100755 --- a/streams/relaxxstreams +++ b/god/streams/bin/relaxxstreams @@ -15,9 +15,9 @@ from subprocess import Popen, PIPE os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) pidfile = "/tmp/krebs.stream.pid" -baseurl="http://elab.mpd.shack/" +baseurl="http://lounge.mpd.shack/" url=baseurl+"include/controller-playlist.php?action=%s&value=%s&json=%s" -url_file = os.environ.get("STREAM_DB", "direct.db") +url_file = os.environ.get("STREAM_DB", "../db/direct.db") urls = [] for line in open(url_file): diff --git a/streams/stream-starter b/god/streams/bin/stream-starter index 4d3a406f..4d3a406f 100755 --- a/streams/stream-starter +++ b/god/streams/bin/stream-starter diff --git a/streams/streams.py b/god/streams/bin/streams index 65669b2d..ea6e9a90 100644..100755 --- a/streams/streams.py +++ b/god/streams/bin/streams @@ -5,7 +5,7 @@ from subprocess import Popen, PIPE os.chdir(os.path.dirname(os.path.realpath(sys.argv[0]))) pidfile = "/tmp/krebs.stream.pid" -url_file = os.environ.get("STREAM_DB", "stream.db") +url_file = os.environ.get("STREAM_DB", "../db/stream.db") urls = [] #urls = [ url,f for (url,f) in open(url_file).readline() ] for line in open(url_file): diff --git a/god/streams/db/direct.db b/god/streams/db/direct.db new file mode 100644 index 00000000..02da4608 --- /dev/null +++ b/god/streams/db/direct.db @@ -0,0 +1,78 @@ +http://ice.somafm.com/groovesalad groove +http://ice.somafm.com/u80s underground80s +http://de.scenemusic.net/necta192.mp3 demoscene +http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan +http://stream2.jungletrain.net:8000 jungletrain +http://streams.xenim.de/radiotux.ogg radiotux +http://localhost:8000/stream.ogg icecast +http://localhost:8000/shice.ogg shice +http://sfstream1.somafm.com:9090 480min +http://mp1.somafm.com:8080 480min +http://ice.somafm.com/480min 480min +http://shouthostdirect11.streams.bassdrive.com:8398 bassdrive +http://sanjose1.serverhostingcenter.streams.bassdrive.com:8600 bassdrive +http://arces.net.streams.bassdrive.com:8000 bassdrive +http://amsterdam1.serverhostingcenter.streams.bassdrive.com:8000 bassdrive +http://shouthostdirect10.streams.bassdrive.com:8200 bassdrive +http://shouthostdirect13.streams.bassdrive.com:8202 bassdrive +http://czech1.serverhostingcenter.streams.bassdrive.com:8200 bassdrive +http://shouthostdirect12.streams.bassdrive.com:8200 bassdrive +http://beezle.streams.bassdrive.com:8765 bassdrive +http://sfstream1.somafm.com:8384 beatblender +http://sfstream1.somafm.com:8388 beatblender +http://ice.somafm.com/beatblender beatblender +http://sfstream1.somafm.com:8040 blackrockfm +http://ice.somafm.com/brfm blackrockfm +http://sfstream1.somafm.com:7000 bootliquor +http://207.200.96.230:8014 bootliquor +http://mp1.somafm.com:9004 bootliquor +http://ice.somafm.com/bootliquor bootliquor +http://sfstream1.somafm.com:8062 cliqhop +http://mp2.somafm.com:2668 cliqhop +http://ice.somafm.com/cliqhop cliqhop +http://sfstream1.somafm.com:8700 covers +http://ice.somafm.com/covers covers +http://85.21.79.93:8040 deepmix +http://212.7.194.133:8128 deepmix +http://85.21.79.31:7128 deepmix +http://69.163.134.109:8128 deepmix +http://194.183.224.59:8128 deepmix +http://radio.cdn.deluxemusic.tv/deluxemusic.tv/radio_web/mp3 deluxe +http://sfstream1.somafm.com:8900 digitalis +http://ice.somafm.com/digitalis digitalis +http://205.234.246.42:8300 doomed +http://sfstream1.somafm.com:8300 doomed +http://ice.somafm.com/doomed doomed +http://streamer-dtc-aa01.somafm.com:80/stream/1032 dronezone +http://sfstream1.somafm.com:8014 dronezone +http://mp2.somafm.com:8002 dronezone +http://ice.somafm.com/dronezone dronezone +http://sfstream1.somafm.com:8500 illstreet +http://ice.somafm.com/illstreet illstreet +http://sfstream1.somafm.com:8090 indypop +http://ice.somafm.com/indiepop indypop +http://sfstream1.somafm.com:8800 lush +http://mp1.somafm.com:8800 lush +http://ice.somafm.com/lush lush +http://sfstream1.somafm.com:2020 missioncontrol +http://mp1.somafm.com:2020 missioncontrol +http://ice.somafm.com/missioncontrol missioncontrol +http://sfstream1.somafm.com:2200 poptron +http://ice.somafm.com/poptron poptron +http://sfstream1.somafm.com:8002 secretagent +http://mp2.somafm.com:9016 secretagent +http://ice.somafm.com/secretagent secretagent +http://sfstream1.somafm.com:8600 sonicuniverse +http://mp2.somafm.com:8600 sonicuniverse +http://ice.somafm.com/sonicuniverse sonicuniverse +http://mp2.somafm.com:5400 southbysoma +http://ice.somafm.com/sxfm southbysoma +http://sfstream1.somafm.com:8000 spacestationsoma +http://mp2.somafm.com:2666 spacestationsoma +http://ice.somafm.com/spacestation spacestationsoma +http://sfstream1.somafm.com:8850 suburbsofgoa +http://ice.somafm.com/suburbsofgoa suburbsofgoa +http://205.188.215.230:8010 tagstrip +http://ice.somafm.com/tags tagstrip +http://sfstream1.somafm.com:8880 underground80s +http://ice.somafm.com/u80s underground80s diff --git a/streams/stream.db b/god/streams/db/stream.db index 2e873843..1d9b51bc 100644 --- a/streams/stream.db +++ b/god/streams/db/stream.db @@ -7,7 +7,7 @@ http://stream2.jungletrain.net:8000 jungletrain http://playlist.tormentedradio.com/tormentedradio.pls tormented http://filebitch.shack:8000 mpd http://radio.krautchan.net:8000/radio.mp3 radiofreieskrautchan -http://nl1.streamhosting.ch/listen.pls lounge +http://nl1.streamhosting.ch:80 lounge http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls deluxe http://livestream.radiodarmstadt.de:8000 darmstadt http://somafm.com/sxfm.pls southbysoma @@ -26,7 +26,7 @@ http://somafm.com/bootliquor.pls bootliquor http://somafm.com/covers.pls covers http://somafm.com/illstreet.pls illstreet http://somafm.com/tags.pls tagstrip -http://somafm.com/groovesalad.pls groove +http://somafm.com/groovesalad.pls groove http://somafm.com/lush.pls lush http://somafm.com/digitalis.pls digitalis http://somafm.com/sonicuniverse.pls sonicuniverse diff --git a/streams/relaxxplayer.api b/god/streams/doc/relaxxplayer.api index 6e8af577..50d25af2 100644 --- a/streams/relaxxplayer.api +++ b/god/streams/doc/relaxxplayer.api @@ -2,7 +2,7 @@ http://lounge.mpd.shack/include/controller-playback.php?action=setCrossfade&valu http://lounge.mpd.shack/include/controller-playback.php?action=repeat&value=1&json=null http://lounge.mpd.shack/include/controller-playlist.php?action=clear&value=&json=null http://lounge.mpd.shack/include/controller-playlist.php?action=addSong&value=http%3A%2F%2F212.7.194.133%3A8128&json=null -http://lounge.mpd.shack/include/controller- playlist.php?action=getPlaylistInfo&value=0&json= +http://lounge.mpd.shack/include/controller-playlist.php?action=getPlaylistInfo&value=0&json= [{ "file": "http:\/\/212.7.194.133:8128", "Title": "Max & Dima - Sapovnela Studio: Batut", diff --git a/streichelzoo/README b/god/streichelzoo/README index f93eb8c5..f93eb8c5 100644 --- a/streichelzoo/README +++ b/god/streichelzoo/README diff --git a/streichelzoo/button_down.png b/god/streichelzoo/button_down.png Binary files differindex f952aabf..f952aabf 100644 --- a/streichelzoo/button_down.png +++ b/god/streichelzoo/button_down.png diff --git a/streichelzoo/button_up.png b/god/streichelzoo/button_up.png Binary files differindex 71253b23..71253b23 100644 --- a/streichelzoo/button_up.png +++ b/god/streichelzoo/button_up.png diff --git a/streichelzoo/main.avg b/god/streichelzoo/main.avg index 2a67a881..2a67a881 100644 --- a/streichelzoo/main.avg +++ b/god/streichelzoo/main.avg diff --git a/streichelzoo/streichelzoo.py b/god/streichelzoo/streichelzoo.py index 25b83964..25b83964 100644 --- a/streichelzoo/streichelzoo.py +++ b/god/streichelzoo/streichelzoo.py diff --git a/shack/strom/main.py b/god/strom-decoder/main.py index e1a85d02..e1a85d02 100644 --- a/shack/strom/main.py +++ b/god/strom-decoder/main.py diff --git a/shack/strom/testdata b/god/strom-decoder/testdata index c4db6b5d..c4db6b5d 100644 --- a/shack/strom/testdata +++ b/god/strom-decoder/testdata diff --git a/shack/strom/testdatacomment b/god/strom-decoder/testdatacomment index e453b98b..e453b98b 100644 --- a/shack/strom/testdatacomment +++ b/god/strom-decoder/testdatacomment diff --git a/temper/.gitignore b/god/temper/.gitignore index 7e50641a..7e50641a 100644 --- a/temper/.gitignore +++ b/god/temper/.gitignore diff --git a/temper/99-tempsensor.rules b/god/temper/99-tempsensor.rules index 441a469e..441a469e 100644 --- a/temper/99-tempsensor.rules +++ b/god/temper/99-tempsensor.rules diff --git a/god/temper/Makefile b/god/temper/Makefile new file mode 100644 index 00000000..80c0206f --- /dev/null +++ b/god/temper/Makefile @@ -0,0 +1,20 @@ + +all: infest +infest: temper rules-install +CFLAGS = -O2 -Wall + +temper: temper.c + ${CC} -DUNIT_TEST -o $@ $^ -lusb + chmod +s temper + cp -a temper /usr/bin +clean: + rm -f temper *.o + +rules-install: /etc/udev/rules.d/99-tempsensor.rules +/etc/udev/rules.d/99-tempsensor.rules: + cp 99-tempsensor.rules /etc/udev/rules.d +debian-prereq: + apt-get install libusb-dev +uninstall: + rm -f /etc/udev/rules.d/99-tempsensor.rules /usr/bin/temper + diff --git a/god/temper/collectd-temper.sh b/god/temper/collectd-temper.sh new file mode 100755 index 00000000..f66e9acc --- /dev/null +++ b/god/temper/collectd-temper.sh @@ -0,0 +1,9 @@ +HOSTNAME="${COLLECTD_HOSTNAME:-localhost}" +INTERVAL="${COLLECTD_INTERVAL:-30}" +TEMPERNAME="${TEMPERNAME:-external}" +TEMPERBIN="${TEMPERBIN:-/krebs/temper/temper}" +#while sleep "$INTERVAL"; do + VALUE=`$TEMPERBIN` + echo "PUTVAL \"$HOSTNAME/sensors-temper/temperature-$TEMPERNAME\" N:$VALUE" #interval=$INTERVAL + logger "PUTVAL \"$HOSTNAME/sensors-temper/temperature-$TEMPERNAME\" N:$VALUE" #interval=$INTERVAL +#done diff --git a/temper/temper.c b/god/temper/temper.c index 390f9056..390f9056 100644 --- a/temper/temper.c +++ b/god/temper/temper.c diff --git a/temper/temper.h b/god/temper/temper.h index 7ea6280a..7ea6280a 100644 --- a/temper/temper.h +++ b/god/temper/temper.h diff --git a/god/twinter/init_stripped.py b/god/twinter/init_stripped.py index 4d359171..79550158 100644 --- a/god/twinter/init_stripped.py +++ b/god/twinter/init_stripped.py @@ -14,17 +14,16 @@ auth = tweepy.OAuthHandler(CONSUMER_KEY, CONSUMER_SECRET) auth.set_access_token(ACCESS_KEY, ACCESS_SECRET) api = tweepy.API(auth) mention = api.mentions()[0] -mention_stripped = mention.text.replace("@shacktwinter","").lstrip().rstrip() -mention_stripped = re.sub(r'[^\w _|@\[\]{}()<>:;!#$%^&+=-]+','',mention_stripped)[:32] +mention_stripped =re.sub(r'[^\w _|@\[\]{}()<>:;!#$%^&+=-]+','', + mention.text.replace("@shacktwinter","").lstrip().rstrip())[:32] f = open(os.path.dirname(os.path.abspath(sys.argv[0]))+"/msg_file","r+") last = f.read() -#sys.exit(23) + if last == mention_stripped: print "received old message" sys.exit(23) else: print "received new message: %s" % mention_stripped - s = socket(AF_INET, SOCK_STREAM) send_message = \ '\x1b%%-12345X@PJL JOB\n@PJL RDYMSG DISPLAY="%s"\n@PJL EOJ\n\x1b%%-12345X' % (mention_stripped, ) @@ -37,4 +36,5 @@ else: f.close() if not mention.user.following: mention.user.follow() - api.update_status("@%s i appreciate your message '%s' for twinter! Ready Message updated." %(mention.user.screen_name,mention_stripped.upper()),in_reply_to_status_id=mention.id) + api.update_status("@%s i appreciate your message '%s' for twinter! Ready Message updated." % + (mention.user.screen_name,mention_stripped.upper()),in_reply_to_status_id=mention.id) diff --git a/gold/affiliate/README.md b/gold/affiliate/README.md new file mode 100644 index 00000000..81a3d52c --- /dev/null +++ b/gold/affiliate/README.md @@ -0,0 +1,9 @@ +# Installation + +# Firefox +Step 1: [Install Greasemonkey](https://addons.mozilla.org/de/firefox/addon/greasemonkey/) +Step 2: Click on affiliate.user.js + +# Chrome +Step 1: download affiliate.user.js onto your desktop +Step 2: Open chrome->tools->extensions and drag affiliate.user.js into chrome window diff --git a/gold/affiliate/affiliate.user.js b/gold/affiliate/affiliate.user.js new file mode 100644 index 00000000..57d51f1f --- /dev/null +++ b/gold/affiliate/affiliate.user.js @@ -0,0 +1,96 @@ +// ==UserScript== +// @name Krebs Affiliate Programs + extras (auto-SSL...) +// @namespace https://blogs.fsfe.org/h2/userscripts/ +// @description Modify Amazon to support Krebs, always use SSL and shorten links (only Amazon) + +// Contains the getASIN()-function from: +// http://userscripts.org/scripts/review/3284 by Jim Biancolo + +// shamelessly stolen from +// http://userscripts.org/scripts/show/129547 +// + +// @version 0.42 +// @include * +// @license CC0 / Do what the fuck you want to license +// see http://sam.zoy.org/wtfpl/ +// see http://creativecommons.org/publicdomain/zero/1.0/ + +// @author Hannes Hauswedell +// @author makefu +// @homepage http://euer.krebsco.de +// ==/UserScript== + + + +function getASIN(href) { + var asinMatch; + asinMatch = href.match(/\/exec\/obidos\/ASIN\/(\w{10})/i); + if (!asinMatch) { asinMatch = href.match(/\/gp\/product\/(\w{10})/i); } + if (!asinMatch) { asinMatch = href.match(/\/exec\/obidos\/tg\/detail\/\-\/(\w{10})/i); } + if (!asinMatch) { asinMatch = href.match(/\/dp\/(\w{10})/i); } + if (!asinMatch) { return null; } + return asinMatch[1]; +} + +(function() +{ + var links = document.getElementsByTagName("a"); + + for (i = 0; i < links.length; i++) + { + var curLink = links[i].href; + + // AMAZON + if (curLink.match(/https?\:\/\/(www\.)?amazon\./i)) + { + var affiliateID = ''; + var host = ''; + if (curLink.match(/amazon\.de/i)) + { + host = 'amazon.de'; + affiliateID = 'krebsco-21'; + } + else if (curLink.match(/amazon\.co\.uk/i)) + { + host = 'amazon.co.uk'; + affiliateID = 'krebscode-21'; + } + else if (curLink.match(/amazon\.ca/i)) + { + host = 'amazon.ca'; + affiliateID = 'krebscoca-20'; + } + else if (curLink.match(/amazon\.fr/i)) + { + host = 'amazon.fr'; + affiliateID = 'krebscode01-21'; + } + else if (curLink.match(/amazon\.es/i)) + { + host = 'amazon.es'; + affiliateID = 'krebscode0f-21'; + } + else if (curLink.match(/amazon\.it/i)) + { + host = 'amazon.it'; + affiliateID = 'krebscode04-21'; + } + else if (curLink.match(/amazon\.com/i)) + { + host = 'amazon.com'; + affiliateID = 'krebsco-20'; + } + + var asin = getASIN(curLink); + if (affiliateID != '') + { + if (asin != null) + links[i].setAttribute("href", "https://www."+host+"/dp/" + asin + "/?tag="+affiliateID); +// else +// links[i].setAttribute("href", curLink + "?tag="+affiliateID); + } + } + + } +})(); diff --git a/infest/skel/etc/rc.local b/infest/skel/etc/rc.local index f224f9e4..7cf99aeb 100755 --- a/infest/skel/etc/rc.local +++ b/infest/skel/etc/rc.local @@ -1,7 +1,7 @@ #! /bin/sh -e morse() { - /krebs/morse/morse.sh "$@" + /krebs/util/morse/morse.sh "$@" } morse -l 42 -f 4000 `hostname` diff --git a/minikrebs/.gitignore b/minikrebs/.gitignore new file mode 100644 index 00000000..8d0fa061 --- /dev/null +++ b/minikrebs/.gitignore @@ -0,0 +1 @@ +builder/ diff --git a/minikrebs/build/heckenkrebs-factory.bin b/minikrebs/build/heckenkrebs-factory.bin Binary files differnew file mode 100644 index 00000000..dec89f16 --- /dev/null +++ b/minikrebs/build/heckenkrebs-factory.bin diff --git a/minikrebs/build/heckenkrebs-sysupgrade.bin b/minikrebs/build/heckenkrebs-sysupgrade.bin Binary files differnew file mode 100644 index 00000000..70bb0f25 --- /dev/null +++ b/minikrebs/build/heckenkrebs-sysupgrade.bin diff --git a/minikrebs/doc/Camkrebs b/minikrebs/doc/Camkrebs new file mode 100644 index 00000000..060bf60d --- /dev/null +++ b/minikrebs/doc/Camkrebs @@ -0,0 +1,19 @@ + +# packages +kmod-video-uvc +mjpg-streamer + +# mjpg-streamer +original package not available in snapshot, grab it from old sources +## opkg.conf + + src/gz attitude_adjustment http://downloads.openwrt.org/attitude_adjustment/12.09-beta2/ar71xx/generic/packages/ + +## running live + + mjpg_streamer -i "input_uvc.so -d /dev/video0 -r 640x480" -o "output_http.so -p 8080 -w /www/webcam" + +## running in temp + + opkg install -d ram mjpg_streamer + LD_LIBRARY_PATH=/tmp/lib:/tmp/usr/bin /tmp/usr/bin/mjpg_streamer -i "input_uvc.so -d /dev/video0 -r 640x480" -o "output_http.so -p 8080 -w /tmp/www/webcam" diff --git a/minikrebs/doc/QUICKSTART b/minikrebs/doc/QUICKSTART new file mode 100644 index 00000000..ac4ae384 --- /dev/null +++ b/minikrebs/doc/QUICKSTART @@ -0,0 +1,37 @@ +# Quickstart to get your own own krebs on wr703n + +!important this is pseudo code, so please use your brains + + cd /krebs/minikrebs + ./prepare krebs + builder/init + +# Stock image +connect to krebs + + dhclient eth0 + firefox 192.168.1.1 + {{goto the firmware-upgrade page}} + {{upload ../builder/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin}} + {{wait}} + {{reconnect power}} + +# Upgrade image + + {{ start krebs in recovery mode}} + ifconfig eth0 192.168.1.3 + sysctl net.ipv4.ip_forward=1 + iptables -t nat -A POSTROUTING -o wlan0 -j MASQUERADE #assuming wlan0 provides internet access + telnet 192.168.1.1 + mount_root + passwd + /etc/init.d/dropbear start + exit + OWN_IP=192.168.1.3 ./upgrade 192.168.1.1 + {{reconnect power}} + {{password is minikrebs}} + +# when minikrebs is in dhcp-client mode + echo 'dhcp-range=192.168.0.50,192.168.0.150,12h' > /etc/dnsmasq.conf + ifconfig eth0 192.168.0.1 && dnsmasq -d + diff --git a/minikrebs/doc/TLDR b/minikrebs/doc/TLDR new file mode 100644 index 00000000..9a33c437 --- /dev/null +++ b/minikrebs/doc/TLDR @@ -0,0 +1,3 @@ +This is how you get a cool webcam-streamer image for your WR703N: + ./prepare instacam && builder/init +Use it to flash your minirouter, password is `minikrebs` diff --git a/minikrebs/doc/lazorcam_druck.svg b/minikrebs/doc/lazorcam_druck.svg new file mode 100644 index 00000000..4f376059 --- /dev/null +++ b/minikrebs/doc/lazorcam_druck.svg @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="744.09448" + height="524.40942" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="lazorcam_druck.svg"> + <defs + id="defs4"> + <filter + id="filter3162" + inkscape:menu-tooltip="Draws a black outline around" + inkscape:menu="ABCs" + inkscape:label="Black outline" + color-interpolation-filters="sRGB"> + <feGaussianBlur + id="feGaussianBlur3164" + stdDeviation="2" + in="SourceAlpha" + result="result0" /> + <feComposite + id="feComposite3166" + in2="result0" + result="result3" + operator="arithmetic" + in="SourceGraphic" + k2="1" + k3="10" /> + <feComposite + id="feComposite3168" + in2="result3" + k2="1" + operator="in" + in="result3" + result="result4" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.7" + inkscape:cx="540.90757" + inkscape:cy="337.03064" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1364" + inkscape:window-height="747" + inkscape:window-x="0" + inkscape:window-y="19" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="1,0" + position="58.571429,342.14286" + id="guide3033" /> + <sodipodi:guide + orientation="1,0" + position="169.70563,528.30978" + id="guide3069" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer"> + <rect + style="fill:#f9f9f9;fill-opacity:1;filter:url(#filter3162)" + id="rect3116" + width="747.14288" + height="525.71429" + x="0.71427059" + y="0.12369233" /> + </g> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-527.95273)"> + <text + xml:space="preserve" + style="font-size:73.84999847px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="372.04724" + y="618.20862" + id="text2985" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan2987" + x="372.04724" + y="618.20862">LAZORCAM</tspan></text> + <text + xml:space="preserve" + style="font-size:25px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="58.57143" + y="710.2193" + id="text3001" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3003" + x="58.57143" + y="710.2193">Boot: </tspan><tspan + sodipodi:role="line" + x="58.57143" + y="736.48553" + id="tspan3011" + style="font-size:20px">- Lazorcam hat Stom wenn die blaue LED leuchtet</tspan><tspan + sodipodi:role="line" + x="58.57143" + y="761.48553" + id="tspan3009" + style="font-size:20px">- Wenn die LED vom Zustand "Blinkend" in den</tspan><tspan + sodipodi:role="line" + x="58.57143" + y="786.48553" + id="tspan3017" + style="font-size:20px"> Zustand "durchgängig Leuchtend" gewechselt ist,</tspan><tspan + sodipodi:role="line" + x="58.57143" + y="811.48553" + id="tspan3019" + style="font-size:20px"> ist der Bootvorgang abgeschlossen </tspan></text> + <text + xml:space="preserve" + style="font-size:25px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="372.37073" + y="649.85162" + id="text3005" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3007" + x="372.37073" + y="649.85162">Schaue dem Lazor beim Arbeiten zu</tspan></text> + <text + xml:space="preserve" + style="font-size:25px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="76.428574" + y="352.98083" + id="text3021" + sodipodi:linespacing="125%" + transform="translate(0,527.95273)"><tspan + sodipodi:role="line" + id="tspan3023"></tspan></text> + <text + xml:space="preserve" + style="font-size:25px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="58.57143" + y="889.7276" + id="text3035" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="58.57143" + y="889.7276" + id="tspan3065">Erreichbarkeit:</tspan><tspan + sodipodi:role="line" + x="58.57143" + y="915.99384" + id="tspan3049" + style="font-size:20px"> HTTP: </tspan><tspan + sodipodi:role="line" + x="58.57143" + y="940.99384" + id="tspan3051" + style="font-size:20px" /><tspan + sodipodi:role="line" + x="58.57143" + y="965.99384" + id="tspan3039" + style="font-size:20px"> VLC: File -> Open Network Stream -></tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="169.70563" + y="915.99158" + id="text3071" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3073" + x="169.70563" + y="915.99158">http://lazorcam.shack/</tspan></text> + <flowRoot + xml:space="preserve" + id="flowRoot3075" + style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:25px;line-height:125%;letter-spacing:0px;word-spacing:0px"><flowRegion + id="flowRegion3077"><rect + id="rect3079" + width="91.923882" + height="160.61426" + x="11.111678" + y="21.353456" /></flowRegion><flowPara + id="flowPara3081"></flowPara></flowRoot> <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="169.70563" + y="989.73273" + id="text3087" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3089" + x="169.70563" + y="989.73273">http://lazorcam.shack/?action=stream</tspan><tspan + sodipodi:role="line" + x="169.70563" + y="1014.7327" + id="tspan3091" /></text> + </g> +</svg> diff --git a/oncology/Makefile b/minikrebs/oncology/Makefile index 05d5c422..05d5c422 100644 --- a/oncology/Makefile +++ b/minikrebs/oncology/Makefile diff --git a/minikrebs/oncology/README b/minikrebs/oncology/README new file mode 100644 index 00000000..60261618 --- /dev/null +++ b/minikrebs/oncology/README @@ -0,0 +1 @@ +# lcd4linux for DigitalPhotoFrame diff --git a/oncology/lcd4linux.conf b/minikrebs/oncology/config/full.conf index be16629d..be16629d 100644 --- a/oncology/lcd4linux.conf +++ b/minikrebs/oncology/config/full.conf diff --git a/minikrebs/prepare b/minikrebs/prepare new file mode 100755 index 00000000..a22a1aa6 --- /dev/null +++ b/minikrebs/prepare @@ -0,0 +1,45 @@ +#!/bin/bash +set -euf +IMAGEBUILDER_URL="http://downloads.openwrt.org/attitude_adjustment/12.09-beta2/ar71xx/generic/OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486.tar.bz2" + +cd $(dirname $(readlink -f $0)) +if [ x"${1:-}" == x ];then + echo "usage: $0 PROFILE" + echo + echo "Available Profiles:" + ls -1 profiles/ |grep -v '^README' | grep -v '^init$' | while read profile; do + echo " $profile" + done + exit 1 +fi +PROFILE=$1 +if [ ! -e builder/Makefile ]; then + wget -O- $IMAGEBUILDER_URL | tar xj OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486 + mv -f OpenWrt-ImageBuilder-ar71xx_generic-for-linux-i486 builder + echo "Builder successfully downloaded" +else + echo "Builder already installed, skipping download" +fi +echo +echo "copying generic init:" +cp --remove-destination profiles/init builder/init +echo " profile/init -> builder/init" +[ -e builder/overlay ] && echo "removing old overlay" && rm -rf builder/overlay +echo +echo "copying profile:" +find profiles/$PROFILE -mindepth 1 -maxdepth 1| while read file; do + echo " $file -> builder/$(basename $file)" + rm -rf builder/$(basename $file) + cp -r $file builder/ +done + +echo +echo $PROFILE > builder/current_profile +echo "Finished Preparing Profile $PROFILE" +echo 'run `builder/init`' + +if [ -e builder/overlay ];then + echo + echo "This profile also contains overlay data," + echo 'run `builder/init_overlay` to copy' +fi diff --git a/minikrebs/profiles/README.md b/minikrebs/profiles/README.md new file mode 100644 index 00000000..743a3b35 --- /dev/null +++ b/minikrebs/profiles/README.md @@ -0,0 +1,9 @@ +# Profiles + +Every profile must have a `custom_make` script which builds the image for the +profile. This script also can contain which customizes the image files before +building. + +You may also want to include your own files into your image, adding file=customfile in your custom\_make. + +default password is `minikrebs` diff --git a/minikrebs/profiles/heckenkrebs/custom_make b/minikrebs/profiles/heckenkrebs/custom_make new file mode 100755 index 00000000..4694530b --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/custom_make @@ -0,0 +1,2 @@ +#!/bin/sh +make image PROFILE=TLWR703 PACKAGES="tinc curl kmod-ipv6 kmod-fs-ext4 radvd ip wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-usb-storage -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/config/network b/minikrebs/profiles/heckenkrebs/customfiles/etc/config/network new file mode 100644 index 00000000..2feb7400 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/config/network @@ -0,0 +1,17 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option type 'bridge' + option proto 'static' + option ipaddr '192.168.1.1' + option netmask '255.255.255.0' + +config interface 'wan' + option ifname 'wlan0' + option proto 'dhcp' diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/config/wireless b/minikrebs/profiles/heckenkrebs/customfiles/etc/config/wireless new file mode 100644 index 00000000..d2dc5a37 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/config/wireless @@ -0,0 +1,18 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11ng' + option path 'platform/ar933x_wmac' + option htmode 'HT20' + list ht_capab 'SHORT-GI-20' + list ht_capab 'SHORT-GI-40' + list ht_capab 'RX-STBC1' + list ht_capab 'DSSS_CCK-40' + +config wifi-iface + option device 'radio0' + option network 'wan' + option encryption 'none' + option mode 'sta' + option ssid 'linksys' + diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/heckenkrebs/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/rc.local b/minikrebs/profiles/heckenkrebs/customfiles/etc/rc.local new file mode 100644 index 00000000..9b8eb564 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/rc.local @@ -0,0 +1,7 @@ +# Put your custom commands here that should be executed once +# the system init finished. By default this file does nothing. + +tincd -n retiolum 2>/dev/null +aap & + +exit 0 diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/wifiblack b/minikrebs/profiles/heckenkrebs/customfiles/etc/wifiblack new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/wifiblack diff --git a/minikrebs/profiles/heckenkrebs/customfiles/etc/wifipw b/minikrebs/profiles/heckenkrebs/customfiles/etc/wifipw new file mode 100644 index 00000000..d235df78 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/etc/wifipw @@ -0,0 +1 @@ +shack;weissichnichtbinnochneuhierfragmalralf diff --git a/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/aap b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/aap new file mode 100755 index 00000000..75e1cbfe --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/aap @@ -0,0 +1,115 @@ +#!/usr/bin/awk -f + +BEGIN { + chan=0; + essid=""; + encr=0; + psk2=0; + psk=0; + i=0; + # find interface - start by finding if in sta mode + while( "uci show wireless" | getline) { + if(/mode=sta/) { + split($0,wl,"."); + iface=wl[2]; + } + } + close("uci show wireless") + "uci get wireless." iface ".device" | getline radio + close("uci get wireless." iface ".device") + system("ifconfig wlan0 up") + for(;;){ + while( "iwlist wlan0 scan" | getline ) { + scan[i++]=$0; + } + close("iwlist wlan0 scan") + for (j=0;j<i;j++) { + $0=scan[j]; + if ($1 == "Cell" || $1 == EOF ) { + if(chan == 0) continue; + #get mac + mac=$5 + # we're at the end of a record + # process data we have and try to connect + if(psk2 == 1) crypt = "psk2"; + else if (psk == 1) crypt ="psk"; + else if (encr == 1) crypt = "wep"; + else crypt = "none"; + psk=0; + psk2=0; + encr=0; + rkey=""; + # first we see if we're in blacklist + bl="0" + "cat /etc/wifiblack | grep \"" essid "$\"" | getline bl + close("cat /etc/wifiblack | grep \"" essid "$\"") + if ( bl == "1" ) { + print essid " blacklisted"; + continue; + } + # now we get key if we're encrypted + if ( crypt != "none" ) { + "cat /etc/wifipw | grep \"" essid ";\" | sed 's/[^;]*;//' " | getline rkey + close("cat /etc/wifipw | grep \"" essid ";\" | sed 's/.*;//' ") + if ( rkey == "" ) { + m=match(essid,"EasyBox"); + if (RLENGTH > 0) { + "easybox_keygen " mac | getline rkey + close("easybox_keygen " mac) + } + else { + print essid " is encrypted and key not in whitelist"; + continue; + } + } + } + system("uci set wireless." radio ".channel=" channel); + system("uci set wireless." iface ".ssid=" essid); + if (crypt == "none") { + system("uci set wireless." iface ".encryption=none"); + system("uci -q delete wireless." iface ".key"); + } + else { + system("uci set wireless." iface ".key=" rkey); + system("uci set wireless." iface ".encryption=" crypt); + } + system("uci show wireless > /tmp/keepalive"); + system("wifi up"); + while(system("sleep 60; wget -q -T 30 -O /dev/null http://google.com/index.html") == 0) { + system("ledoff") + } + } + else { + # now test for the things we want + # channel + if (/Channel:[0-9]/) { + m=match($0,"Channel"); + if (RSTART > 0) { + s=substr($0,m); + n=match(s,/[0-9]+/); + chan=substr(s,n,RLENGTH) + } + continue; + } + # we don't need else as we break on successful find + if (/^ *ESSID/) { + m=match($0,"\".*\""); + if (RSTART > 0) essid=substr($0,m+1,RLENGTH-2); + continue; + } + if (/^ *Encryption key:on/) { + encr = 1; + continue; + } + if (/^ *IE: IEEE 802.11i\/WPA2/) { + psk2=1; + continue; + } + if (/^ *IE: WPA /) { + psk=1; + continue; + } + } + } + } + } diff --git a/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/easybox_keygen b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/easybox_keygen new file mode 100755 index 00000000..e9a9beca --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/easybox_keygen @@ -0,0 +1,40 @@ +#!/bin/sh +# +# easybox_keygen.sh (c) 2012 GPLv3 +# +# www.wotan.cc +# + +MAC=$1 + +# Take the last 2 Bytes of the MAC-Address (0B:EC), and convert it to decimal. + +take5=${MAC:12} +last4=${take5/:/} + +# Fill up to 4 places with zeros, if necessary: +deci=$(printf "%04d" "0x$last4" | sed 's/.*\(....\)/\1/;s/./& /g') +#echo M4: ${deci[@]} +# +# The digits M9 to M12 are just the last digits (9.-12.) of the MAC: +hexi=$(echo ${MAC:12:5} | sed 's/://;s/./& /g') +#echo 'M4 (Hex): ' ${hexi[@]} +# K1 = last byte of (d0 + d1 + h2 + h3) +# K2 = last byte of (h0 + h1 + d2 + d3) +c1=$(printf "%d + %d + %d + %d" ${deci:0:1} ${deci:2:1} 0x${hexi:4:1} 0x${hexi:6:1}) +c2=$(printf "%d + %d + %d + %d" 0x${hexi:0:1} 0x${hexi:2:1} ${deci:4:1} ${deci:6:1}) +K1=$((($c1)%16)) +K2=$((($c2)%16)) +#printf "K1: %x\n" $K1 +#printf "K2: %x\n" $K2 +X1=$((K1^${deci:6:1})) +X2=$((K1^${deci:4:1})) +X3=$((K1^${deci:2:1})) +Y1=$((K2^0x${hexi:2:1})) +Y2=$((K2^0x${hexi:4:1})) +Y3=$((K2^0x${hexi:6:1})) +Z1=$((0x${hexi:4:1}^${deci:6:1})) +Z2=$((0x${hexi:6:1}^${deci:4:1})) +Z3=$((K1^K2)) +printf "%x%x%x%x%x%x%x%x%x\n" $X1 $Y1 $Z1 $X2 $Y2 $Z2 $X3 $Y3 $Z3 | tr a-f A-F + diff --git a/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/infest b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/infest new file mode 100755 index 00000000..f1bcc594 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/infest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +read HOSTNAME +curl tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/ledoff b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/ledoff new file mode 100755 index 00000000..0bc6ec7a --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/ledoff @@ -0,0 +1,2 @@ +#!/bin/sh +echo 0 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/tinc-update b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..2c6ec432 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (curl http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/profiles/heckenkrebs/doc/README.md b/minikrebs/profiles/heckenkrebs/doc/README.md new file mode 100644 index 00000000..8972d4b8 --- /dev/null +++ b/minikrebs/profiles/heckenkrebs/doc/README.md @@ -0,0 +1,19 @@ +# Heckenkrebs +Heckenkrebs is the automatic internet-establish and gateway provider for the +krebs darknet. + +This profile will automatically establish wireless connections to shared wireless networks. If you want the Krebs to connect to your wlan you need to add your wireless credentials to /etc/wifipw. Syntax is $SSID;$PW +W-Lans can be blacklisted by adding the ssid to /etc/wifiblack + +run infest on the system to get into the retiolum darknet (requires internet) +hostsfiles for tinc can be updated with tinc-update + +the LED will turn off after 60 seconds of working internet connection to save power + +# Functionality +The Heckenkrebs will use the aap tool to connect randomly to wireless networks +which are unprotected in some ways. + +aap is patched to calculate default easybox keys in addition to try open +networks. It also provides a blacklist and access-point password list. + diff --git a/minikrebs/profiles/init b/minikrebs/profiles/init new file mode 100755 index 00000000..df9fcfcd --- /dev/null +++ b/minikrebs/profiles/init @@ -0,0 +1,39 @@ +#!/bin/bash + +cd $(dirname $(readlink -f $0)) +if [ ! -e Makefile ] ;then + echo "ImageBuilder not checked out yet" + echo "try running ../prepare $$PROFILE" + exit 1 +fi + +echo +rm -r bin/ || echo "no bindir, skipping removal" +if [ -e ./custom_make ];then + echo "Starting Custom Make" + sh ./custom_make 2>/dev/null | while read line; do + echo -n . + done +else + echo "No Custom Make Script exists, bailing out!" + exit 1 +fi + +echo + +if [ -e bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin ]; +then + cat << EOF +finished building +You can use the following images: + Factory : $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin + System Upgrade: $PWD/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin +EOF +else + cat << EOF +It seems like the factory image has not been created, it is most +likely that the image would be too big and does not fit into the tiny FLASH. + +Try removing modules from \`custom_make\` and retry building. +EOF +fi diff --git a/minikrebs/profiles/init_overlay b/minikrebs/profiles/init_overlay new file mode 100644 index 00000000..3b714c39 --- /dev/null +++ b/minikrebs/profiles/init_overlay @@ -0,0 +1,10 @@ +#!/bin/sh +[ ! -e overlay/ ] && echo "profile data for external overlay does not exist, bailing out" + +[ ! -e doc/overlay ] && echo "Profile demands the following partitioning of the overlay usb stick:" && cat doc/overlay + +if grep -q $PWD/mnt/overlay /etc/mtab;then + +else + echo "please mount your overlay to $PWD/overlay" +fi diff --git a/minikrebs/profiles/instacam/custom_make b/minikrebs/profiles/instacam/custom_make new file mode 100755 index 00000000..cfe965b2 --- /dev/null +++ b/minikrebs/profiles/instacam/custom_make @@ -0,0 +1,3 @@ +#!/bin/sh + +make image PROFILE=TLWR703 PACKAGES="ip kmod-ipv6 kmod-fs-ext4 wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-video-uvc mjpg-streamer -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq -radvd " FILES=customfiles/ diff --git a/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer new file mode 100644 index 00000000..298b06fe --- /dev/null +++ b/minikrebs/profiles/instacam/customfiles/etc/config/mjpg-streamer @@ -0,0 +1,7 @@ +config mjpg-streamer core + option enabled "1" + option device "/dev/video0" + option resolution "1280x720" + option fps "25" + option www "/www/webcam" + option port "80" diff --git a/minikrebs/profiles/instacam/customfiles/etc/config/network b/minikrebs/profiles/instacam/customfiles/etc/config/network new file mode 100644 index 00000000..c459c4e0 --- /dev/null +++ b/minikrebs/profiles/instacam/customfiles/etc/config/network @@ -0,0 +1,9 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' diff --git a/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/instacam/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/instacam/customfiles/etc/rc.local b/minikrebs/profiles/instacam/customfiles/etc/rc.local new file mode 100644 index 00000000..3e91b57c --- /dev/null +++ b/minikrebs/profiles/instacam/customfiles/etc/rc.local @@ -0,0 +1 @@ +insmod uvcvideo diff --git a/minikrebs/profiles/instacam/customfiles/etc/shadow b/minikrebs/profiles/instacam/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/instacam/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/instacam/doc/README.md b/minikrebs/profiles/instacam/doc/README.md new file mode 100644 index 00000000..b5da2ddb --- /dev/null +++ b/minikrebs/profiles/instacam/doc/README.md @@ -0,0 +1,52 @@ +# Project Instacam + +# Description + +The aim of the project is to reliably push a video stream directly to the internets for +everyone to see at a very low price. + +# Hardware + +## Core (Wifi / Ethernet) +- TP-Link WR703n[Amazon](https://www.amazon.de/dp/B008UNA6FS/?tag=krebsco-21)[Ebay China](http://www.ebay.de/itm/BLUE-Mini-Nano-TP-LINK-TL-WR703N-150Mbps-WiFi-for-iPhone-4S-Wireless-Router-HOT-/360501556127?pt=COMP_EN_Routers&hash=item53ef91339f ) ~ 16 Euro +- USB Webcam + - [Logitech C270 with Autofocus (AZ)](https://www.amazon.de/dp/B003PAOAWG/?tag=krebsco-21) ~ 25 Euro + - [China NoName Cam (DX)](http://dx.com/p/compact-1-3mp-pc-usb-webcam-with-built-in-microphone-black-51874?Utm_rid=93398939&Utm_source=affiliate) ~ 5++ Euro + - [\* List of UVC Supported Devices](http://www.ideasonboard.org/uvc/ ) + - [\* List of GSPCA Supported Devices](http://linuxtv.org/wiki/index.php/Gspca_devices) +## 4G / 3G / UMTS +Currently Untested: +- usb hub ~ 4 Euro + - [NoName USB 2.0 Hub (DX)](http://dx.com/p/4-port-usb-2-0-hub-7980?Utm_rid=93398939&Utm_source=affiliate) + - [NoName USB 2.0 Hub (Ebay)](http://www.ebay.de/itm/200825754462?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649#ht_2486wt_1366) +- umts stick ~ 20 Euro +- MicroSD card (optional) + +## Mobile Version +either use (easy mode): +- USB Battery Bank + - [Dealextreme](http://dx.com/p/rechargeable-2000mah-mobile-emergency-power-battery-with-6-adapters-66902?Utm_rid=93398939&Utm_source=affiliate) +or (expert mode): +- DC-DC StepDown Module + - [Ebay](http://www.ebay.de/itm/221162832094?ssPageName=STRK:MEWNX:IT&_trksid=p3984.m1497.l2649#ht_3092wt_1132) +- Battery Pack + - take any battery pack you can find (car battery, model making) + +# Software + +## Build Firmware + + git clone github.com/krebscode/painload krebs + cd krebs/minikrebs + ./prepare instacam + builder/init + +## Flash + + # flash image is at: + # builder/bin/ar71xx/openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-sysupgrade.bin + + # either flash image directly via web interface or + # after obtaining ssh-access on the router run + + OWN_IP=<<your ip>> ./upgrade <<remote ip>> diff --git a/minikrebs/profiles/instakrebs/custom_make b/minikrebs/profiles/instakrebs/custom_make new file mode 100755 index 00000000..e5ee946e --- /dev/null +++ b/minikrebs/profiles/instakrebs/custom_make @@ -0,0 +1,2 @@ +#!/bin/sh +make image PROFILE=TLWR703 PACKAGES="tinc kmod-ipv6 -dnsmasq -radvd ip wireless-tools kmod-fs-ext4 kmod-usb-core kmod-usb2 block-mount kmod-usb-storage -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/config/network b/minikrebs/profiles/instakrebs/customfiles/etc/config/network new file mode 100644 index 00000000..04722166 --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/config/network @@ -0,0 +1,14 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'wan' + option ifname 'wlan0' + option proto 'dhcp' diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/config/system b/minikrebs/profiles/instakrebs/customfiles/etc/config/system new file mode 100644 index 00000000..923755f7 --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/config/system @@ -0,0 +1,11 @@ +config system + option hostname krebsplug + option timezone UTC + +config 'led' 'lan_led' + option 'name' 'LAN' + option 'sysfs' 'tp-link:blue:system' + option 'trigger' 'netdev' + option 'dev' 'eth0' + option 'mode' 'link tx rx' + diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc b/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc new file mode 100644 index 00000000..3a03196c --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/config/tinc @@ -0,0 +1,2 @@ +config tinc-net retiolum + option enabled 1 diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/config/wireless b/minikrebs/profiles/instakrebs/customfiles/etc/config/wireless new file mode 100644 index 00000000..e08a42ed --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11ng' + option path 'platform/ar933x_wmac' + option htmode 'HT20' + list ht_capab 'SHORT-GI-20' + list ht_capab 'SHORT-GI-40' + list ht_capab 'RX-STBC1' + list ht_capab 'DSSS_CCK-40' + option disabled 1 + +config wifi-iface + option device 'radio0' + option network 'wan' + option encryption 'none' + option mode 'sta' + option ssid 'linksys' + diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/instakrebs/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/rc.d/tinc b/minikrebs/profiles/instakrebs/customfiles/etc/rc.d/tinc new file mode 120000 index 00000000..f08fe11d --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/rc.d/tinc @@ -0,0 +1 @@ +../init.d/tinc
\ No newline at end of file diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/rc.local b/minikrebs/profiles/instakrebs/customfiles/etc/rc.local new file mode 100644 index 00000000..3113cc2a --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/rc.local @@ -0,0 +1,3 @@ +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest +exit 0 diff --git a/minikrebs/profiles/instakrebs/customfiles/etc/shadow b/minikrebs/profiles/instakrebs/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/instakrebs/customfiles/usr/bin/autoinfest b/minikrebs/profiles/instakrebs/customfiles/usr/bin/autoinfest new file mode 100755 index 00000000..a30c1a2b --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/usr/bin/autoinfest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +HOSTNAME=$(uci get system.@system[0].hostname)_$(hostid) +wget -O- http://tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/instakrebs/customfiles/usr/bin/genhostid b/minikrebs/profiles/instakrebs/customfiles/usr/bin/genhostid new file mode 100755 index 00000000..463e04b7 --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/usr/bin/genhostid @@ -0,0 +1,2 @@ +#!/bin/sh +dd if=/dev/urandom bs=1 count=4> /etc/hostid diff --git a/minikrebs/profiles/instakrebs/customfiles/usr/bin/led b/minikrebs/profiles/instakrebs/customfiles/usr/bin/led new file mode 100755 index 00000000..e3e998a8 --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/usr/bin/led @@ -0,0 +1,3 @@ +#!/bin/sh +[ x${:-} = x ] && echo "usage: $0 [0|1]" && exit 1 +echo $1 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/instakrebs/customfiles/usr/bin/tinc-update b/minikrebs/profiles/instakrebs/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..4ff46b8f --- /dev/null +++ b/minikrebs/profiles/instakrebs/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (wget -O- http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/profiles/instakrebs/doc/README.md b/minikrebs/profiles/instakrebs/doc/README.md new file mode 100644 index 00000000..a9e5306f --- /dev/null +++ b/minikrebs/profiles/instakrebs/doc/README.md @@ -0,0 +1,3 @@ +# Instakrebs + +This image is a merge of instacam and krebs. diff --git a/minikrebs/profiles/instakrebs_zc3xx/custom_make b/minikrebs/profiles/instakrebs_zc3xx/custom_make new file mode 100755 index 00000000..642513be --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/custom_make @@ -0,0 +1,3 @@ +#!/bin/sh + +make image PROFILE=TLWR703 PACKAGES="tinc ip kmod-ipv6 kmod-fs-ext4 wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-video-gspca-zc3xx mjpg-streamer -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq -radvd" FILES=customfiles/ diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/mjpg-streamer new file mode 100644 index 00000000..7417837e --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/mjpg-streamer @@ -0,0 +1,7 @@ +config mjpg-streamer core + option enabled "1" + option device "/dev/video0" + option resolution "640x480" + option fps "25" + option www "/www/webcam" + option port "80" diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/network b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/network new file mode 100644 index 00000000..04722166 --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/network @@ -0,0 +1,14 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'wan' + option ifname 'wlan0' + option proto 'dhcp' diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/system b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/system new file mode 100644 index 00000000..5371b6bb --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/system @@ -0,0 +1,11 @@ +config system + option hostname camkrebs + option timezone UTC + +config 'led' 'lan_led' + option 'name' 'LAN' + option 'sysfs' 'tp-link:blue:system' + option 'trigger' 'netdev' + option 'dev' 'eth0' + option 'mode' 'link tx rx' + diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/wireless b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/wireless new file mode 100644 index 00000000..e08a42ed --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11ng' + option path 'platform/ar933x_wmac' + option htmode 'HT20' + list ht_capab 'SHORT-GI-20' + list ht_capab 'SHORT-GI-40' + list ht_capab 'RX-STBC1' + list ht_capab 'DSSS_CCK-40' + option disabled 1 + +config wifi-iface + option device 'radio0' + option network 'wan' + option encryption 'none' + option mode 'sta' + option ssid 'linksys' + diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/rc.local b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/rc.local new file mode 100644 index 00000000..847a029f --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/rc.local @@ -0,0 +1,4 @@ +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest & +tincd -n retiolum +exit 0 diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/shadow b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/autoinfest b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/autoinfest new file mode 100755 index 00000000..a30c1a2b --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/autoinfest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +HOSTNAME=$(uci get system.@system[0].hostname)_$(hostid) +wget -O- http://tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/genhostid b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/genhostid new file mode 100755 index 00000000..463e04b7 --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/genhostid @@ -0,0 +1,2 @@ +#!/bin/sh +dd if=/dev/urandom bs=1 count=4> /etc/hostid diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/led b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/led new file mode 100755 index 00000000..e3e998a8 --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/led @@ -0,0 +1,3 @@ +#!/bin/sh +[ x${:-} = x ] && echo "usage: $0 [0|1]" && exit 1 +echo $1 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/tinc-update b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..4ff46b8f --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (wget -O- http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/profiles/instakrebs_zc3xx/doc/README.md b/minikrebs/profiles/instakrebs_zc3xx/doc/README.md new file mode 100644 index 00000000..0c7f52d1 --- /dev/null +++ b/minikrebs/profiles/instakrebs_zc3xx/doc/README.md @@ -0,0 +1,6 @@ + +This profile is a fork of instacam and krebs. + +Firmware for krebs with Cheapo china webcam with zc3xx chipset attached. +Full documentation in profiles/instacam/doc and profiles/krebs/doc. + diff --git a/minikrebs/profiles/krebs/custom_make b/minikrebs/profiles/krebs/custom_make new file mode 100755 index 00000000..cb70f4e8 --- /dev/null +++ b/minikrebs/profiles/krebs/custom_make @@ -0,0 +1,2 @@ +#!/bin/sh +make image PROFILE=TLWR703 PACKAGES="tinc kmod-ipv6 -dnsmasq -radvd ip wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-usb-storage -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/krebs/customfiles/etc/config/network b/minikrebs/profiles/krebs/customfiles/etc/config/network new file mode 100644 index 00000000..04722166 --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/config/network @@ -0,0 +1,14 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'wan' + option ifname 'wlan0' + option proto 'dhcp' diff --git a/minikrebs/profiles/krebs/customfiles/etc/config/system b/minikrebs/profiles/krebs/customfiles/etc/config/system new file mode 100644 index 00000000..923755f7 --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/config/system @@ -0,0 +1,11 @@ +config system + option hostname krebsplug + option timezone UTC + +config 'led' 'lan_led' + option 'name' 'LAN' + option 'sysfs' 'tp-link:blue:system' + option 'trigger' 'netdev' + option 'dev' 'eth0' + option 'mode' 'link tx rx' + diff --git a/minikrebs/profiles/krebs/customfiles/etc/config/wireless b/minikrebs/profiles/krebs/customfiles/etc/config/wireless new file mode 100644 index 00000000..e08a42ed --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11ng' + option path 'platform/ar933x_wmac' + option htmode 'HT20' + list ht_capab 'SHORT-GI-20' + list ht_capab 'SHORT-GI-40' + list ht_capab 'RX-STBC1' + list ht_capab 'DSSS_CCK-40' + option disabled 1 + +config wifi-iface + option device 'radio0' + option network 'wan' + option encryption 'none' + option mode 'sta' + option ssid 'linksys' + diff --git a/minikrebs/profiles/krebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/krebs/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/krebs/customfiles/etc/rc.local b/minikrebs/profiles/krebs/customfiles/etc/rc.local new file mode 100644 index 00000000..001b873f --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/rc.local @@ -0,0 +1,4 @@ +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest & +tincd -n retiolum +exit 0 diff --git a/minikrebs/profiles/krebs/customfiles/etc/shadow b/minikrebs/profiles/krebs/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/krebs/customfiles/usr/bin/autoinfest b/minikrebs/profiles/krebs/customfiles/usr/bin/autoinfest new file mode 100755 index 00000000..a30c1a2b --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/usr/bin/autoinfest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +HOSTNAME=$(uci get system.@system[0].hostname)_$(hostid) +wget -O- http://tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/krebs/customfiles/usr/bin/genhostid b/minikrebs/profiles/krebs/customfiles/usr/bin/genhostid new file mode 100755 index 00000000..463e04b7 --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/usr/bin/genhostid @@ -0,0 +1,2 @@ +#!/bin/sh +dd if=/dev/urandom bs=1 count=4> /etc/hostid diff --git a/minikrebs/profiles/krebs/customfiles/usr/bin/led b/minikrebs/profiles/krebs/customfiles/usr/bin/led new file mode 100755 index 00000000..e3e998a8 --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/usr/bin/led @@ -0,0 +1,3 @@ +#!/bin/sh +[ x${:-} = x ] && echo "usage: $0 [0|1]" && exit 1 +echo $1 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/krebs/customfiles/usr/bin/tinc-update b/minikrebs/profiles/krebs/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..4ff46b8f --- /dev/null +++ b/minikrebs/profiles/krebs/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (wget -O- http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/profiles/krebs/doc/README.md b/minikrebs/profiles/krebs/doc/README.md new file mode 100644 index 00000000..1cb1d2be --- /dev/null +++ b/minikrebs/profiles/krebs/doc/README.md @@ -0,0 +1,8 @@ +# Krebs Profile + +This is the base profile for krebs nodes. Copy it to create cool krebs images. +Core feature is the automatic connection to the retiolum darknet. +# Hard Package dependencies +Make sure to include them in custom\_make + + tinc diff --git a/minikrebs/profiles/lazorkrebs/custom_make b/minikrebs/profiles/lazorkrebs/custom_make new file mode 100755 index 00000000..92271158 --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/custom_make @@ -0,0 +1,3 @@ +#!/bin/sh + +make image PROFILE=TLWR703 PACKAGES="wireless-tools kmod-usb-core kmod-usb2 mjpg-streamer usbip usbip-server kmod-video-uvc -radvd -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq" FILES=customfiles/ diff --git a/minikrebs/profiles/lazorkrebs/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/lazorkrebs/customfiles/etc/config/mjpg-streamer new file mode 100644 index 00000000..bb4f81ec --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/customfiles/etc/config/mjpg-streamer @@ -0,0 +1,7 @@ +config mjpg-streamer core + option enabled "1" + option device "/dev/video0" + option resolution "1280x1024" + option fps "5" + option www "/www/webcam" + option port "80" diff --git a/minikrebs/profiles/lazorkrebs/customfiles/etc/config/network b/minikrebs/profiles/lazorkrebs/customfiles/etc/config/network new file mode 100644 index 00000000..c459c4e0 --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/customfiles/etc/config/network @@ -0,0 +1,9 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' diff --git a/minikrebs/profiles/lazorkrebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/lazorkrebs/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/lazorkrebs/customfiles/etc/rc.local b/minikrebs/profiles/lazorkrebs/customfiles/etc/rc.local new file mode 100644 index 00000000..3e91b57c --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/customfiles/etc/rc.local @@ -0,0 +1 @@ +insmod uvcvideo diff --git a/minikrebs/profiles/lazorkrebs/customfiles/etc/shadow b/minikrebs/profiles/lazorkrebs/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/lazorkrebs/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/nfc-login/custom_make b/minikrebs/profiles/nfc-login/custom_make new file mode 100755 index 00000000..d7945bb9 --- /dev/null +++ b/minikrebs/profiles/nfc-login/custom_make @@ -0,0 +1,2 @@ +#!/bin/sh +make image PROFILE=TLMR3020 PACKAGES="libnfc-bin tinc kmod-ipv6 -dnsmasq -radvd ip wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-usb-storage -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/config/network b/minikrebs/profiles/nfc-login/customfiles/etc/config/network new file mode 100644 index 00000000..04722166 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/config/network @@ -0,0 +1,14 @@ + +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'wan' + option ifname 'wlan0' + option proto 'dhcp' diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/config/system b/minikrebs/profiles/nfc-login/customfiles/etc/config/system new file mode 100644 index 00000000..ee0c6a8c --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/config/system @@ -0,0 +1,23 @@ +config system + option hostname 'nfcgate' + option timezone 'UTC' + +config led 'wps_led' + option name 'WPS' + option sysfs 'tp-link:green:wps' + option trigger 'none' + +config led 'led_usb' + option name 'login' + option sysfs 'tp-link:green:3g' + option trigger 'none' + +config led 'led_wlan' + option name 'WLAN' + option sysfs 'tp-link:green:wlan' + option trigger 'none' + +config led 'led_lan' + option name 'LAN' + option sysfs 'tp-link:green:lan' + option trigger 'none' diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/config/wireless b/minikrebs/profiles/nfc-login/customfiles/etc/config/wireless new file mode 100644 index 00000000..e08a42ed --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ + +config wifi-device 'radio0' + option type 'mac80211' + option hwmode '11ng' + option path 'platform/ar933x_wmac' + option htmode 'HT20' + list ht_capab 'SHORT-GI-20' + list ht_capab 'SHORT-GI-40' + list ht_capab 'RX-STBC1' + list ht_capab 'DSSS_CCK-40' + option disabled 1 + +config wifi-iface + option device 'radio0' + option network 'wan' + option encryption 'none' + option mode 'sta' + option ssid 'linksys' + diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/nfc-login/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/rc.local b/minikrebs/profiles/nfc-login/customfiles/etc/rc.local new file mode 100644 index 00000000..7bca1925 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/rc.local @@ -0,0 +1,5 @@ +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest & +/usr/bin/login-manager & +tincd -n retiolum +exit 0 diff --git a/minikrebs/profiles/nfc-login/customfiles/etc/shadow b/minikrebs/profiles/nfc-login/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/nfc-login/customfiles/usr/bin/autoinfest b/minikrebs/profiles/nfc-login/customfiles/usr/bin/autoinfest new file mode 100755 index 00000000..a30c1a2b --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/usr/bin/autoinfest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +HOSTNAME=$(uci get system.@system[0].hostname)_$(hostid) +wget -O- http://tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/nfc-login/customfiles/usr/bin/genhostid b/minikrebs/profiles/nfc-login/customfiles/usr/bin/genhostid new file mode 100755 index 00000000..463e04b7 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/usr/bin/genhostid @@ -0,0 +1,2 @@ +#!/bin/sh +dd if=/dev/urandom bs=1 count=4> /etc/hostid diff --git a/minikrebs/profiles/nfc-login/customfiles/usr/bin/led b/minikrebs/profiles/nfc-login/customfiles/usr/bin/led new file mode 100755 index 00000000..e3e998a8 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/usr/bin/led @@ -0,0 +1,3 @@ +#!/bin/sh +[ x${:-} = x ] && echo "usage: $0 [0|1]" && exit 1 +echo $1 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/nfc-login/customfiles/usr/bin/login-manager b/minikrebs/profiles/nfc-login/customfiles/usr/bin/login-manager new file mode 100755 index 00000000..63f35c74 --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/usr/bin/login-manager @@ -0,0 +1,34 @@ +#!/bin/sh +#!/bin/sh +#LOGIN_HOST=heidi.shack +#LOGIN_HOST=heidi:5000 +LOGIN_HOST=10.42.10.38:5000 +all_led(){ + for i in 3g wlan lan wps;do + led $i $1 + done +} +led(){ + LED="$1" + ACTION="$2" + echo $ACTION > /sys/class/leds/tp-link:green:$LED/trigger +} +while sleep 1; do + uid=$(nfc-list | grep UID | cut -d: -f 2 | sed 's/ //g') + if ! [ x"$uid" = x ];then + online=$(wget -O- http://$LOGIN_HOST/user/$uid/online 2>/dev/null) + if [ x"$online" = "x" ];then + led lan timer + elif [ "$online" = "false" ];then + action="login" + led 3g timer + else + action="logout" + led wlan timer + fi + wget -O- http://$LOGIN_HOST/user/$uid/$action &>/dev/null + echo $uid $action + sleep 5 + all_led none + fi +done diff --git a/minikrebs/profiles/nfc-login/customfiles/usr/bin/tinc-update b/minikrebs/profiles/nfc-login/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..4ff46b8f --- /dev/null +++ b/minikrebs/profiles/nfc-login/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (wget -O- http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/profiles/nfc-login/doc/README.md b/minikrebs/profiles/nfc-login/doc/README.md new file mode 100644 index 00000000..f1cdc112 --- /dev/null +++ b/minikrebs/profiles/nfc-login/doc/README.md @@ -0,0 +1,10 @@ +# NFCGATE + + +The NFC-Gate is part of the [User Suppository](https://github.com/shackspace/user_suppository) infrastructure. It polls the attached nfc-connector for new cards and uses the UID of the card for trying to either log in or log out the user at the shack-infrastructure. + +The nfcgate is a build for the MR3020, not the WR703 as it uses all the +available LEDs to display the status of the login. + +For more information see: [Github Repository](https://github.com/shackspace/user_suppository) + diff --git a/minikrebs/profiles/rickroller_advanced/airbase-ng b/minikrebs/profiles/rickroller_advanced/airbase-ng Binary files differnew file mode 100755 index 00000000..f6cfd5a6 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/airbase-ng diff --git a/minikrebs/profiles/rickroller_advanced/custom_make b/minikrebs/profiles/rickroller_advanced/custom_make new file mode 100755 index 00000000..2f92476f --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/custom_make @@ -0,0 +1,4 @@ +#!/bin/sh + +HTTPD="uhttpd uhttpd-mod-tls" +make image PROFILE=TLWR703 PACKAGES="$HTTPD dnsmasq wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-usb-storage -radvd -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp new file mode 100644 index 00000000..79d7bea5 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp @@ -0,0 +1,28 @@ +config dnsmasq + option domainneeded 1 + option boguspriv 1 + option filterwin2k 0 # enable for dial on demand + option localise_queries 1 + option rebind_protection 1 # disable if upstream must serve RFC191 +8 addresses + option rebind_localhost 1 # enable for RBL checking and similar se +rvices + #list rebind_domain example.lan # whitelist RFC1918 responses for +domains + #option local '/lan/' + #option domain 'lan' + option expandhosts 1 + option nonegcache 0 + option authoritative 1 + option readethers 1 + option leasefile '/tmp/dhcp.leases' + option resolvfile '/tmp/resolv.conf.auto' + +config dhcp wlan + option interface lan + option start 100 + option limit 150 + option leasetime 12h +config 'domain' + option name '#' + option ip '192.168.23.1' diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/firewall b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/firewall new file mode 100644 index 00000000..56f20aa7 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/firewall @@ -0,0 +1,112 @@ +config defaults + option syn_flood 1 + option input ACCEPT + option output ACCEPT + option forward REJECT + +config zone + option name lan + option network 'lan' + option input ACCEPT + option output ACCEPT + option forward REJECT + +config zone + option name wan + option network 'wan' + option input ACCEPT + option output ACCEPT + option forward REJECT + option masq 1 + option mtu_fix 1 + +config forwarding + option src lan + option dest wan + +# We need to accept udp packets on port 68, +# see https://dev.openwrt.org/ticket/4108 +config rule + option name Allow-DHCP-Renew + option src wan + option proto udp + option dest_port 68 + option target ACCEPT + option family ipv4 + +# Allow IPv4 ping +config rule + option name Allow-Ping + option src wan + option proto icmp + option icmp_type echo-request + option family ipv4 + option target ACCEPT + +# Allow DHCPv6 replies +# see https://dev.openwrt.org/ticket/10381 +config rule + option name Allow-DHCPv6 + option src wan + option proto udp + option src_ip fe80::/10 + option src_port 547 + option dest_ip fe80::/10 + option dest_port 546 + option family ipv6 + option target ACCEPT + +# Allow essential incoming IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Input + option src wan + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + list icmp_type router-solicitation + list icmp_type neighbour-solicitation + list icmp_type router-advertisement + list icmp_type neighbour-advertisement + option limit 1000/sec + option family ipv6 + option target ACCEPT + +# Allow essential forwarded IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Forward + option src wan + option dest * + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + option limit 1000/sec + option family ipv6 + option target ACCEPT + +config redirect + option src lan + option proto tcp + option src_dport 80 + option src_ip !192.168.23.1 + option dest_port 80 + option dest_ip 192.168.23.1 + option target DNAT + +config redirect + option src lan + option proto tcp + option src_dport 443 + option src_ip !192.168.23.1 + option dest_port 443 + option dest_ip 192.168.23.1 + option target DNAT diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/fstab b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/fstab new file mode 100644 index 00000000..b1e678dc --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/fstab @@ -0,0 +1,19 @@ +config global automount + option from_fstab 1 + option anon_mount 1 + +config global autoswap + option from_fstab 1 + option anon_swap 0 + +config mount + option target /overlay + option device /dev/sda1 + option fstype ext4 + option options rw,sync + option enabled 1 + option enabled_fsck 0 + +config swap + option device /dev/sda2 + option enabled 1 diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/network b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/network new file mode 100644 index 00000000..7ac322a7 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/network @@ -0,0 +1,15 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'wan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'lan' + option ifname 'wlan0' + option proto 'static' + option ipaddr 192.168.23.1 + option netmask 255.255.255.0 diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/system b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/system new file mode 100644 index 00000000..ffbe1530 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/system @@ -0,0 +1,8 @@ +config system + option hostname rickroller + option timezone UTC + +config 'led' 'lan_led' + option 'name' 'blue-led' + option 'sysfs' 'tp-link:blue:system' + option 'trigger' 'default-on' diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/uhttpd b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/uhttpd new file mode 100644 index 00000000..74695b7c --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/uhttpd @@ -0,0 +1,13 @@ +config uhttpd main + list listen_http 0.0.0.0:80 + list listen_https 0.0.0.0:443 + option home /www + option rfc1918_filter 1 + option max_requests 3 + option cert /etc/uhttpd.crt + option key /etc/uhttpd.key + option cgi_prefix /cgi-bin + option script_timeout 60 + option network_timeout 30 + option tcp_keepalive 1 + option error_page /index.html diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/wireless b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/wireless new file mode 100644 index 00000000..bce01a9e --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ +config wifi-device radio0 + option type mac80211 + option channel 11 + option macaddr 14:e6:e4:e6:e4:e0 + option hwmode 11ng + option htmode HT20 + list ht_capab SHORT-GI-20 + list ht_capab SHORT-GI-40 + list ht_capab RX-STBC1 + list ht_capab DSSS_CCK-40 + # REMOVE THIS LINE TO ENABLE WIFI: + option disabled 0 + +config wifi-iface + option device radio0 + option network lan + option mode ap + option ssid default + option encryption none diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/rickroller_advanced/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/shadow b/minikrebs/profiles/rickroller_advanced/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.crt b/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.crt Binary files differnew file mode 100644 index 00000000..d406c90f --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.crt diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key b/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key Binary files differnew file mode 100644 index 00000000..d5d163d2 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key diff --git a/minikrebs/profiles/rickroller_advanced/doc/OVERLAY b/minikrebs/profiles/rickroller_advanced/doc/OVERLAY new file mode 100644 index 00000000..f95d8000 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/doc/OVERLAY @@ -0,0 +1,6 @@ +# External USB-Stick Overlay + +partition as following (using cfdisk/parted/gparted): +sdx + -> sdx2 : swap size ~ 320MB + -> sdx1 : ext4 -- The Rest (size > 200MB) diff --git a/minikrebs/profiles/rickroller_advanced/doc/README.md b/minikrebs/profiles/rickroller_advanced/doc/README.md new file mode 100644 index 00000000..355bb9ff --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/doc/README.md @@ -0,0 +1,10 @@ +# Rickroller Profile + +The purpose of the profile is to create an access point where every connection +is rewritten to rickroll. + +this is the advanced profile which faciliates an usb-stick to unleash the full +potential of the platform by using airbase-ng (from aircrack-ng) which will +answer to all the probe requests, effectively rick-rolling each and everyone. + +please also see OVERLAY diff --git a/minikrebs/profiles/rickroller_advanced/overlay/www/1x1.gif b/minikrebs/profiles/rickroller_advanced/overlay/www/1x1.gif Binary files differnew file mode 100644 index 00000000..8e91660f --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/overlay/www/1x1.gif diff --git a/minikrebs/profiles/rickroller_advanced/overlay/www/cgi-bin/rrhelper b/minikrebs/profiles/rickroller_advanced/overlay/www/cgi-bin/rrhelper new file mode 100755 index 00000000..ec328a3b --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/overlay/www/cgi-bin/rrhelper @@ -0,0 +1,15 @@ +#!/bin/sh + +RRLOG="/tmp/rrlog" + +if [ -n "$RRLOG" ]; then + echo `awk '{print $1}' /proc/uptime` $REMOTE_ADDR:$REMOTE_PORT \'$HTTP_REFERER\' \'$HTTP_USER_AGENT\' >>"$RRLOG" +fi + +# To signal a rickroll, blink for 15 seconds +(echo timer > /sys/devices/platform/leds-gpio/leds/tp-link:blue:system/trigger ;sleep 15;echo none > /sys/devices/platform/leds-gpio/leds/tp-link:blue:system/trigger) & + + +echo "Content-type: image/gif" +echo "" +cat /www/1x1.gif diff --git a/minikrebs/profiles/rickroller_advanced/overlay/www/index.html b/minikrebs/profiles/rickroller_advanced/overlay/www/index.html new file mode 100644 index 00000000..46bd7c33 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/overlay/www/index.html @@ -0,0 +1,27 @@ +<html> +<head> +<title>RickRoll'D</title> +</head> +<body > +<center> + <h1 style='font-size:400%'>RickRoll'D</h1> + <img src='rick.gif' width="50%"><br/> + <audio controls id="audio" autoplay loop > + <source src="rick.ogg" type="audio/ogg" ></source> + </audio> +</center> +<script> + //try various hacks to get autorun and looping working +var audio = document.getElementById('audio'); +audio.addEventListener('ended', function(){ + this.currentTime = 0; +}, false); + audio.addEventListener('canplay', function() { + audio.play(); + }); + audio.load(); + audio.play(); +</script> +<img src="/cgi-bin/rrhelper"> +</body> +</html> diff --git a/minikrebs/profiles/rickroller_advanced/overlay/www/rick.gif b/minikrebs/profiles/rickroller_advanced/overlay/www/rick.gif Binary files differnew file mode 100644 index 00000000..3ce9c237 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/overlay/www/rick.gif diff --git a/minikrebs/profiles/rickroller_advanced/overlay/www/rick.ogg b/minikrebs/profiles/rickroller_advanced/overlay/www/rick.ogg Binary files differnew file mode 100644 index 00000000..f52a3d71 --- /dev/null +++ b/minikrebs/profiles/rickroller_advanced/overlay/www/rick.ogg diff --git a/minikrebs/profiles/rickroller_bare/custom_make b/minikrebs/profiles/rickroller_bare/custom_make new file mode 100755 index 00000000..25df33c1 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/custom_make @@ -0,0 +1,5 @@ +#!/bin/sh + +#HTTPD="mini-httpd" +HTTPD="uhttpd uhttpd-mod-tls" +make image PROFILE=TLWR703 PACKAGES="$HTTPD dnsmasq wireless-tools -radvd -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe" FILES=customfiles/ diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/dhcp b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/dhcp new file mode 100644 index 00000000..79d7bea5 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/dhcp @@ -0,0 +1,28 @@ +config dnsmasq + option domainneeded 1 + option boguspriv 1 + option filterwin2k 0 # enable for dial on demand + option localise_queries 1 + option rebind_protection 1 # disable if upstream must serve RFC191 +8 addresses + option rebind_localhost 1 # enable for RBL checking and similar se +rvices + #list rebind_domain example.lan # whitelist RFC1918 responses for +domains + #option local '/lan/' + #option domain 'lan' + option expandhosts 1 + option nonegcache 0 + option authoritative 1 + option readethers 1 + option leasefile '/tmp/dhcp.leases' + option resolvfile '/tmp/resolv.conf.auto' + +config dhcp wlan + option interface lan + option start 100 + option limit 150 + option leasetime 12h +config 'domain' + option name '#' + option ip '192.168.23.1' diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/firewall b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/firewall new file mode 100644 index 00000000..56f20aa7 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/firewall @@ -0,0 +1,112 @@ +config defaults + option syn_flood 1 + option input ACCEPT + option output ACCEPT + option forward REJECT + +config zone + option name lan + option network 'lan' + option input ACCEPT + option output ACCEPT + option forward REJECT + +config zone + option name wan + option network 'wan' + option input ACCEPT + option output ACCEPT + option forward REJECT + option masq 1 + option mtu_fix 1 + +config forwarding + option src lan + option dest wan + +# We need to accept udp packets on port 68, +# see https://dev.openwrt.org/ticket/4108 +config rule + option name Allow-DHCP-Renew + option src wan + option proto udp + option dest_port 68 + option target ACCEPT + option family ipv4 + +# Allow IPv4 ping +config rule + option name Allow-Ping + option src wan + option proto icmp + option icmp_type echo-request + option family ipv4 + option target ACCEPT + +# Allow DHCPv6 replies +# see https://dev.openwrt.org/ticket/10381 +config rule + option name Allow-DHCPv6 + option src wan + option proto udp + option src_ip fe80::/10 + option src_port 547 + option dest_ip fe80::/10 + option dest_port 546 + option family ipv6 + option target ACCEPT + +# Allow essential incoming IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Input + option src wan + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + list icmp_type router-solicitation + list icmp_type neighbour-solicitation + list icmp_type router-advertisement + list icmp_type neighbour-advertisement + option limit 1000/sec + option family ipv6 + option target ACCEPT + +# Allow essential forwarded IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Forward + option src wan + option dest * + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + option limit 1000/sec + option family ipv6 + option target ACCEPT + +config redirect + option src lan + option proto tcp + option src_dport 80 + option src_ip !192.168.23.1 + option dest_port 80 + option dest_ip 192.168.23.1 + option target DNAT + +config redirect + option src lan + option proto tcp + option src_dport 443 + option src_ip !192.168.23.1 + option dest_port 443 + option dest_ip 192.168.23.1 + option target DNAT diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/network b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/network new file mode 100644 index 00000000..7ac322a7 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/network @@ -0,0 +1,15 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'wan' + option ifname 'eth0' + option proto 'dhcp' + +config interface 'lan' + option ifname 'wlan0' + option proto 'static' + option ipaddr 192.168.23.1 + option netmask 255.255.255.0 diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/system b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/system new file mode 100644 index 00000000..ffbe1530 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/system @@ -0,0 +1,8 @@ +config system + option hostname rickroller + option timezone UTC + +config 'led' 'lan_led' + option 'name' 'blue-led' + option 'sysfs' 'tp-link:blue:system' + option 'trigger' 'default-on' diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/uhttpd b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/uhttpd new file mode 100644 index 00000000..74695b7c --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/uhttpd @@ -0,0 +1,13 @@ +config uhttpd main + list listen_http 0.0.0.0:80 + list listen_https 0.0.0.0:443 + option home /www + option rfc1918_filter 1 + option max_requests 3 + option cert /etc/uhttpd.crt + option key /etc/uhttpd.key + option cgi_prefix /cgi-bin + option script_timeout 60 + option network_timeout 30 + option tcp_keepalive 1 + option error_page /index.html diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/config/wireless b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/wireless new file mode 100644 index 00000000..bce01a9e --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/config/wireless @@ -0,0 +1,19 @@ +config wifi-device radio0 + option type mac80211 + option channel 11 + option macaddr 14:e6:e4:e6:e4:e0 + option hwmode 11ng + option htmode HT20 + list ht_capab SHORT-GI-20 + list ht_capab SHORT-GI-40 + list ht_capab RX-STBC1 + list ht_capab DSSS_CCK-40 + # REMOVE THIS LINE TO ENABLE WIFI: + option disabled 0 + +config wifi-iface + option device radio0 + option network lan + option mode ap + option ssid default + option encryption none diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/rickroller_bare/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/shadow b/minikrebs/profiles/rickroller_bare/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.crt b/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.crt Binary files differnew file mode 100644 index 00000000..d406c90f --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.crt diff --git a/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.key b/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.key Binary files differnew file mode 100644 index 00000000..d5d163d2 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/etc/uhttpd.key diff --git a/minikrebs/profiles/rickroller_bare/customfiles/www/1x1.gif b/minikrebs/profiles/rickroller_bare/customfiles/www/1x1.gif Binary files differnew file mode 100644 index 00000000..8e91660f --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/www/1x1.gif diff --git a/minikrebs/profiles/rickroller_bare/customfiles/www/cgi-bin/rrhelper b/minikrebs/profiles/rickroller_bare/customfiles/www/cgi-bin/rrhelper new file mode 100755 index 00000000..ec328a3b --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/www/cgi-bin/rrhelper @@ -0,0 +1,15 @@ +#!/bin/sh + +RRLOG="/tmp/rrlog" + +if [ -n "$RRLOG" ]; then + echo `awk '{print $1}' /proc/uptime` $REMOTE_ADDR:$REMOTE_PORT \'$HTTP_REFERER\' \'$HTTP_USER_AGENT\' >>"$RRLOG" +fi + +# To signal a rickroll, blink for 15 seconds +(echo timer > /sys/devices/platform/leds-gpio/leds/tp-link:blue:system/trigger ;sleep 15;echo none > /sys/devices/platform/leds-gpio/leds/tp-link:blue:system/trigger) & + + +echo "Content-type: image/gif" +echo "" +cat /www/1x1.gif diff --git a/minikrebs/profiles/rickroller_bare/customfiles/www/index.html b/minikrebs/profiles/rickroller_bare/customfiles/www/index.html new file mode 100644 index 00000000..46bd7c33 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/www/index.html @@ -0,0 +1,27 @@ +<html> +<head> +<title>RickRoll'D</title> +</head> +<body > +<center> + <h1 style='font-size:400%'>RickRoll'D</h1> + <img src='rick.gif' width="50%"><br/> + <audio controls id="audio" autoplay loop > + <source src="rick.ogg" type="audio/ogg" ></source> + </audio> +</center> +<script> + //try various hacks to get autorun and looping working +var audio = document.getElementById('audio'); +audio.addEventListener('ended', function(){ + this.currentTime = 0; +}, false); + audio.addEventListener('canplay', function() { + audio.play(); + }); + audio.load(); + audio.play(); +</script> +<img src="/cgi-bin/rrhelper"> +</body> +</html> diff --git a/minikrebs/profiles/rickroller_bare/customfiles/www/rick.gif b/minikrebs/profiles/rickroller_bare/customfiles/www/rick.gif Binary files differnew file mode 100644 index 00000000..3ce9c237 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/www/rick.gif diff --git a/minikrebs/profiles/rickroller_bare/customfiles/www/rick.ogg b/minikrebs/profiles/rickroller_bare/customfiles/www/rick.ogg Binary files differnew file mode 100644 index 00000000..f52a3d71 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/customfiles/www/rick.ogg diff --git a/minikrebs/profiles/rickroller_bare/doc/README.md b/minikrebs/profiles/rickroller_bare/doc/README.md new file mode 100644 index 00000000..bcf721c6 --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/doc/README.md @@ -0,0 +1,24 @@ +# Rickroller Profile + +The purpose of the profile is to create an access point where every connection +is rewritten to rickroll. + +This is the bare profile, providing a basic installation of the rickroller but +everything fits into the 4mb of flash memory of the krebsplug. + +As video autostarting is quite difficult at mobile victims to acchieve, +a short gif with rick dancing plus the first minute of its famous song will be +served by the httpd. + +The dnsmasq will resolve every domain request to the plugs ip-address + + +# Rickroll Loop + +8.8 --> 17.3 ; startup loop +26.3 --> 34 ; were no strangers to love, you know the rules and so do i +26.3 --> 42.6 ; ... gotta make you understand +?? --> ?? ; refrain + +# Honorable Mentions +http://www.finnie.org/2011/08/13/mobile-rickroll-appliance-6-0-released/ diff --git a/minikrebs/profiles/rickroller_bare/doc/videoconvert b/minikrebs/profiles/rickroller_bare/doc/videoconvert new file mode 100644 index 00000000..e514b85a --- /dev/null +++ b/minikrebs/profiles/rickroller_bare/doc/videoconvert @@ -0,0 +1,7 @@ +# To be supported by android: +ffmpeg -i rick720p.mp4 -ss 8.8 -t 8.5 -strict -2 -s 320x240 -vcodec mpeg4 -acodec aac -ac 1 -ar 16000 -r 13 -ab 32000 -aspect 3:2 output-video.mp4 + + +# audio convert +ffmpeg -i rick720p.mp4 -ss 7 -t 45 -ac 1 -ar 16000 -ab 64k -vn -acodec libvorbis rick.ogg +ffmpeg -i rick720p.mp4 -ss 7 -t 45 -ac 1 -ar 16000 -ab 64k -vn rick.mp3 diff --git a/minikrebs/profiles/streamerkrebs/custom_make b/minikrebs/profiles/streamerkrebs/custom_make new file mode 100755 index 00000000..c0ef7104 --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/custom_make @@ -0,0 +1,3 @@ +#!/bin/sh + +make image PROFILE=TLWR703 PACKAGES="wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-usb-storage kmod-fs-ext4 -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq kmod-video-uvc -radvd" FILES=customfiles/ diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer new file mode 100644 index 00000000..bb4f81ec --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/mjpg-streamer @@ -0,0 +1,7 @@ +config mjpg-streamer core + option enabled "1" + option device "/dev/video0" + option resolution "1280x1024" + option fps "5" + option www "/www/webcam" + option port "80" diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/config/network b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/network new file mode 100644 index 00000000..c459c4e0 --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/etc/config/network @@ -0,0 +1,9 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/streamerkrebs/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/rc.local b/minikrebs/profiles/streamerkrebs/customfiles/etc/rc.local new file mode 100644 index 00000000..3e91b57c --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/etc/rc.local @@ -0,0 +1 @@ +insmod uvcvideo diff --git a/minikrebs/profiles/streamerkrebs/customfiles/etc/shadow b/minikrebs/profiles/streamerkrebs/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/streamerkrebs/customfiles/root/load_dependencies b/minikrebs/profiles/streamerkrebs/customfiles/root/load_dependencies new file mode 100644 index 00000000..dceabe98 --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/customfiles/root/load_dependencies @@ -0,0 +1,12 @@ +#!/bin/sh + +if ping -w 1 google.de;then + echo "loading update" + opkg update + echo "installing ffmpeg" + opkg install ffmpeg +else + echo "no internet connection, bailing out" +fi + + diff --git a/minikrebs/profiles/streamerkrebs/doc/README.md b/minikrebs/profiles/streamerkrebs/doc/README.md new file mode 100644 index 00000000..32a2cf2a --- /dev/null +++ b/minikrebs/profiles/streamerkrebs/doc/README.md @@ -0,0 +1,3 @@ +# Introduction +- Streamerkrebs will require an usb-hub plus usb-stick and webcam in order to + do the right thing diff --git a/minikrebs/profiles/usbbridge/custom_make b/minikrebs/profiles/usbbridge/custom_make new file mode 100755 index 00000000..ed43f4fe --- /dev/null +++ b/minikrebs/profiles/usbbridge/custom_make @@ -0,0 +1,3 @@ +#!/bin/sh + +make image PROFILE=TLWR703 PACKAGES="tinc ip wireless-tools kmod-usb-core kmod-usb2 usbip-server -radvd -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -dnsmasq" FILES=customfiles/ diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/config/network b/minikrebs/profiles/usbbridge/customfiles/etc/config/network new file mode 100644 index 00000000..c459c4e0 --- /dev/null +++ b/minikrebs/profiles/usbbridge/customfiles/etc/config/network @@ -0,0 +1,9 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'lan' + option ifname 'eth0' + option proto 'dhcp' diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/usbbridge/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/usbbridge/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/rc.local b/minikrebs/profiles/usbbridge/customfiles/etc/rc.local new file mode 100644 index 00000000..49ae50b3 --- /dev/null +++ b/minikrebs/profiles/usbbridge/customfiles/etc/rc.local @@ -0,0 +1,3 @@ +insmod usbip-host +usbip bind -b 1-1 +usbipd -D diff --git a/minikrebs/profiles/usbbridge/customfiles/etc/shadow b/minikrebs/profiles/usbbridge/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/usbbridge/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/usbbridge/doc/README b/minikrebs/profiles/usbbridge/doc/README new file mode 100644 index 00000000..68e6a979 --- /dev/null +++ b/minikrebs/profiles/usbbridge/doc/README @@ -0,0 +1,21 @@ +# usbbridge + +krebsplug will start up as usbbridge with usbip-utils. +it will run an usbipd and grab an ip-address via dhcp. + +# setup +connect usb-device and then connect krebsplug to power. +when changing the usb-device, detach it on the client side, +power off the krebsplug, attach usb device and power up +then. + +# usage +## client side attach + + modprobe vhci-hcd + usbip list -r <<KREBSIP>> + usbip attach -h <<KREBSIP>> -p 1-1 + +## client side detach + + usbip detach -p 0 diff --git a/minikrebs/profiles/wifibridge/.gitignore b/minikrebs/profiles/wifibridge/.gitignore new file mode 100644 index 00000000..44fa020f --- /dev/null +++ b/minikrebs/profiles/wifibridge/.gitignore @@ -0,0 +1 @@ +customfiles/etc/tinc diff --git a/minikrebs/profiles/wifibridge/custom_make b/minikrebs/profiles/wifibridge/custom_make new file mode 100755 index 00000000..53e23d90 --- /dev/null +++ b/minikrebs/profiles/wifibridge/custom_make @@ -0,0 +1,2 @@ +#!/bin/sh +make image PROFILE=TLWR703 PACKAGES="tinc curl kmod-ipv6 ip wireless-tools block-mount kmod-usb-core kmod-usb2 kmod-fs-ext4 kmod-usb-storage -kmod-ppp -kmod-pppoe -kmod-pppox -ppp -ppp-mod-pppoe -radvd -dnsmasq" FILES=customfiles/ diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/config/firewall b/minikrebs/profiles/wifibridge/customfiles/etc/config/firewall new file mode 100644 index 00000000..fa8730af --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/config/firewall @@ -0,0 +1,104 @@ +config defaults + option syn_flood 1 + option input ACCEPT + option output ACCEPT + option forward REJECT +# Uncomment this line to disable ipv6 rules +# option disable_ipv6 1 + +config zone + option name lan + option network 'lan' + option input ACCEPT + option output ACCEPT + option forward REJECT + +config zone + option name wan + option network 'wan' + option input REJECT + option output ACCEPT + option forward REJECT + option masq 1 + option mtu_fix 1 + +config forwarding + option src lan + option dest wlan + +config forwarding + option src wlan + option dest lan + +# We need to accept udp packets on port 68, +# see https://dev.openwrt.org/ticket/4108 +config rule + option name Allow-DHCP-Renew + option src wan + option proto udp + option dest_port 68 + option target ACCEPT + option family ipv4 + +# Allow IPv4 ping +config rule + option name Allow-Ping + option src wan + option proto icmp + option icmp_type echo-request + option family ipv4 + option target ACCEPT + +# Allow DHCPv6 replies +# see https://dev.openwrt.org/ticket/10381 +config rule + option name Allow-DHCPv6 + option src wan + option proto udp + option src_ip fe80::/10 + option src_port 547 + option dest_ip fe80::/10 + option dest_port 546 + option family ipv6 + option target ACCEPT + +# Allow essential incoming IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Input + option src wan + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + list icmp_type router-solicitation + list icmp_type neighbour-solicitation + list icmp_type router-advertisement + list icmp_type neighbour-advertisement + option limit 1000/sec + option family ipv6 + option target ACCEPT + +# Allow essential forwarded IPv6 ICMP traffic +config rule + option name Allow-ICMPv6-Forward + option src wan + option dest * + option proto icmp + list icmp_type echo-request + list icmp_type echo-reply + list icmp_type destination-unreachable + list icmp_type packet-too-big + list icmp_type time-exceeded + list icmp_type bad-header + list icmp_type unknown-header-type + option limit 1000/sec + option family ipv6 + option target ACCEPT + +# include a file with users custom iptables rules +config include + option path /etc/firewall.user diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/config/fstab b/minikrebs/profiles/wifibridge/customfiles/etc/config/fstab new file mode 100644 index 00000000..b1e678dc --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/config/fstab @@ -0,0 +1,19 @@ +config global automount + option from_fstab 1 + option anon_mount 1 + +config global autoswap + option from_fstab 1 + option anon_swap 0 + +config mount + option target /overlay + option device /dev/sda1 + option fstype ext4 + option options rw,sync + option enabled 1 + option enabled_fsck 0 + +config swap + option device /dev/sda2 + option enabled 1 diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/config/network b/minikrebs/profiles/wifibridge/customfiles/etc/config/network new file mode 100644 index 00000000..af6b3e70 --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/config/network @@ -0,0 +1,17 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +#config interface 'lan' + #option ifname 'eth0' + #option type 'bridge' + #option proto 'static' + #option ipaddr '192.168.1.1' + #option netmask '255.255.255.0' + +config interface 'lan' + option ifname 'eth0' + option type 'bridge' + option proto 'dhcp' diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/config/wireless b/minikrebs/profiles/wifibridge/customfiles/etc/config/wireless new file mode 100644 index 00000000..8500741e --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/config/wireless @@ -0,0 +1,21 @@ +config wifi-device radio0 + option disabled 0 + option type mac80211 + option channel 11 + option macaddr ec:17:2f:dd:28:ae + option hwmode 11ng + option htmode HT20 + list ht_capab SHORT-GI-20 + list ht_capab SHORT-GI-40 + list ht_capab RX-STBC1 + list ht_capab DSSS_CCK-40 + +## Access Point mode +config wifi-iface + option device radio0 + option network lan + option mode ap + option ssid MaintenanceNet + option encryption psk2 + option key 'lolwut internet' + option hidden 1 diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/dropbear/authorized_keys b/minikrebs/profiles/wifibridge/customfiles/etc/dropbear/authorized_keys new file mode 120000 index 00000000..9c87fc52 --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/dropbear/authorized_keys @@ -0,0 +1 @@ +/root/.ssh/authorized_keys
\ No newline at end of file diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/rc.local b/minikrebs/profiles/wifibridge/customfiles/etc/rc.local new file mode 100644 index 00000000..001b873f --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/rc.local @@ -0,0 +1,4 @@ +[ ! -e /etc/hostid ] && /usr/bin/genhostid +[ ! -e /etc/tinc/retiolum ] && /usr/bin/autoinfest & +tincd -n retiolum +exit 0 diff --git a/minikrebs/profiles/wifibridge/customfiles/etc/shadow b/minikrebs/profiles/wifibridge/customfiles/etc/shadow new file mode 100644 index 00000000..9cc800dd --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/etc/shadow @@ -0,0 +1,5 @@ +root:$1$WFDw.yoc$MuPQ4h/nu3WMpHmte5Yrp/:15719:0:99999:7::: +daemon:*:0:0:99999:7::: +ftp:*:0:0:99999:7::: +network:*:0:0:99999:7::: +nobody:*:0:0:99999:7::: diff --git a/minikrebs/profiles/wifibridge/customfiles/root/.ssh/authorized_keys b/minikrebs/profiles/wifibridge/customfiles/root/.ssh/authorized_keys new file mode 100644 index 00000000..26a68430 --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/root/.ssh/authorized_keys @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl3RTOHd5DLiVeUbUr/GSiKoRWknXQnbkIf+uNiFO+XxiqZVojPlumQUVhasY8UzDzj9tSDruUKXpjut50FhIO5UFAgsBeMJyoZbgY/+R+QKU00Q19+IiUtxeFol/9dCO+F4o937MC0OpAC10LbOXN/9SYIXueYk3pJxIycXwUqhYmyEqtDdVh9Rx32LBVqlBoXRHpNGPLiswV2qNe0b5p919IGcslzf1XoUzfE3a3yjk/XbWh/59xnl4V7Oe7+iQheFxOT6rFA30WYwEygs5As//ZYtxvnn0gA02gOnXJsNjOW9irlxOUeP7IOU6Ye3WRKFRR0+7PS+w8IJLag2xb makefu@arch diff --git a/minikrebs/profiles/wifibridge/customfiles/usr/bin/autoinfest b/minikrebs/profiles/wifibridge/customfiles/usr/bin/autoinfest new file mode 100755 index 00000000..a30c1a2b --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/usr/bin/autoinfest @@ -0,0 +1,4 @@ +#!/bin/sh +printf "enter your tincname:" +HOSTNAME=$(uci get system.@system[0].hostname)_$(hostid) +wget -O- http://tinc.krebsco.de | HOSTN=$HOSTNAME sh diff --git a/minikrebs/profiles/wifibridge/customfiles/usr/bin/genhostid b/minikrebs/profiles/wifibridge/customfiles/usr/bin/genhostid new file mode 100755 index 00000000..463e04b7 --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/usr/bin/genhostid @@ -0,0 +1,2 @@ +#!/bin/sh +dd if=/dev/urandom bs=1 count=4> /etc/hostid diff --git a/minikrebs/profiles/wifibridge/customfiles/usr/bin/led b/minikrebs/profiles/wifibridge/customfiles/usr/bin/led new file mode 100755 index 00000000..e3e998a8 --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/usr/bin/led @@ -0,0 +1,3 @@ +#!/bin/sh +[ x${:-} = x ] && echo "usage: $0 [0|1]" && exit 1 +echo $1 > /sys/class/leds/tp-link\:blue\:system/brightness diff --git a/minikrebs/profiles/wifibridge/customfiles/usr/bin/tinc-update b/minikrebs/profiles/wifibridge/customfiles/usr/bin/tinc-update new file mode 100755 index 00000000..4ff46b8f --- /dev/null +++ b/minikrebs/profiles/wifibridge/customfiles/usr/bin/tinc-update @@ -0,0 +1,4 @@ +#!/bin/sh +if test -e /etc/tinc/retiolum; then + if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (wget -O- http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi +fi diff --git a/minikrebs/upgrade b/minikrebs/upgrade new file mode 100755 index 00000000..36ef91cc --- /dev/null +++ b/minikrebs/upgrade @@ -0,0 +1,31 @@ +#!/bin/bash +OWN_ADDR=${OWN_ADDR:-192.168.0.1} +PORT=8080 +IMAGE=${IMAGE:-openwrt-ar71xx-generic-tl-wr703n-v1-squashfs-factory.bin} +cd $(dirname $(readlink -f $0)) +if [ x"${1:-}" == x ];then + echo "usage: $0 ADDRESS" + echo + echo "ENVIRONMENT:" + echo " OWN_ADDR (currently $OWN_ADDR)" + echo " IMAGE (currently $IMAGE)" + echo " PORT (currently $PORT)" + + exit 1 +fi + +IP=$1 +cd builder/bin/ar71xx/ + +if [ -e "$IMAGE" ];then + python2 -m SimpleHTTPServer $PORT & + sleep 1 + SERVER_PID=$! + ssh root@$IP "wget -O /tmp/firmware.bin http://${OWN_ADDR}:${PORT}/${IMAGE} \ + && /sbin/mtd write /tmp/firmware.bin firmware \ + && /sbin/reboot" + kill $SERVER_PID +else + echo "cannot find ar71xx build, aborting" + exit 1 +fi diff --git a/node/Makefile b/node/Makefile deleted file mode 100644 index cbfa1e4a..00000000 --- a/node/Makefile +++ /dev/null @@ -1,8 +0,0 @@ - -.PHONY: all install - -all: - @echo "You are made of stupid!"; exit 23 - -install: - ./install diff --git a/node/install b/node/install deleted file mode 100755 index 1284a73a..00000000 --- a/node/install +++ /dev/null @@ -1,79 +0,0 @@ -#! /bin/sh -# -# //node/install -# -# export version=X.Y.Z to install a specific version -# otherwise the latest upstream version will be determined and used -# -# export force=true to install even though it already seems to be installed -# -# export clean=true to first wipe any generated files -# -set -xeuf - -# cd //node -cd $(readlink -f $(dirname $0)) - -# PATH prepend //node/tools //util/bin -export PATH="$PWD/tools:$PWD/../util/bin${PATH+:$PATH}" - -if test "${force-false}" = true; then - : # skip check if it is already installed -else - if test -e ../bin/node; then - : '[32m//bin/node[m # is already installed' - exit - fi -fi - -if test "${clean-false}" = true; then - rm -fR src out -fi - -test -d src || mkdir -v src -cd src - -version=${version-`latest-version`} - -target=node-v$version - -distfile=$target.tar.gz - -download() { - curl -C - -so $distfile http://nodejs.org/dist/v$version/$distfile || - curl -C - -so $distfile http://nodejs.org/dist/$distfile || : -} -is_downloaded() { - gzip -t $distfile 2>/dev/null -} -if ! is_downloaded; then - download - if ! is_downloaded; then - rm -f $distfile - download - fi - if ! is_downloaded; then - rm -f $distfile - echo failed to download distfile - exit 1 - fi -fi - -if ! zcat $distfile | tar -x --keep-newer-files 2>/dev/null; then - rm -fR $target - zcat $distfile | tar -x -fi - -cd .. - -prefix=out/$target -mkdir -p $prefix -prefix=`readlink -f $prefix` - -cd src/$target -./configure --prefix=$prefix -CPPFLAGS=-Wno-unused-but-set-variable make -make install -cd ../.. - -ln -snf ../node/out/$target/bin/node ../bin/node diff --git a/node/tools/latest-version b/node/tools/latest-version deleted file mode 100755 index b99276d5..00000000 --- a/node/tools/latest-version +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -# -# //node/tools/latest-version - retrieve the latest node version from the IN -# -set -euf - -# cd //node -cd $(readlink -f $(dirname $0)/..) - -# PATH prepend //util/bin -export PATH="$PWD/../util/bin${PATH+:$PATH}" - -# TODO punani install executable: curl - -curl -fsS http://nodejs.org/ | - hrefs | - sed -n 's:.*node-v\([0-9.]\+\)\.tar\.gz:\1:p' | - sort | - tail -n 1 diff --git a/punani/db/punani b/punani/db/punani index ad477dab..e5d1f383 100644 --- a/punani/db/punani +++ b/punani/db/punani @@ -43,7 +43,7 @@ }, "tinc" : { "apt-get" : "tinc", - "yaourt" : "tinc" + "pacman" : "tinc" }, "python-notify" : { "pacman" : "python-notify", diff --git a/host/dist/arch/getsize b/punani/host/dist/arch/getsize index a2ef8f95..a2ef8f95 100755 --- a/host/dist/arch/getsize +++ b/punani/host/dist/arch/getsize diff --git a/retiolum/bin/announce_pubkey b/retiolum/bin/announce_pubkey new file mode 100755 index 00000000..ce5aed19 --- /dev/null +++ b/retiolum/bin/announce_pubkey @@ -0,0 +1,35 @@ +#!/bin/sh +set -euf +HOST="${1:-}" + +usage (){ +cat <<EOF +usage: $0 HOSTNAME + +also, you are made of stupid +EOF +exit 23 +} + +[ "x$HOST" = "x" ] && usage + +CHANNEL="#krebsco" +IRCHOST="irc.freenode.net" +PORT=6667 +RETIOLUM="/etc/tinc/retiolum" +PUBFILE="$RETIOLUM/hosts/$HOST" + +if [ ! -e $PUBFILE ] ;then + echo "cannot find $PUBFILE - host $HOST wrong?" ; + echo + usage +fi + +NICK="${HOST}_$((RANDOM%666))" + +( echo "NICK $NICK"; + echo "USER $NICK $IRCHOST bla : $NICK"; + echo "JOIN $CHANNEL"; + sleep 23; + sed "s/^\(.*\)/PRIVMSG $CHANNEL : \1/" $PUBFILE; + sleep 5; ) | telnet $IRCHOST $PORT diff --git a/retiolum/bin/check-free-retiolum-v4 b/retiolum/bin/check-free-retiolum-v4 index 3f0dbdf8..3492f7f6 100755 --- a/retiolum/bin/check-free-retiolum-v4 +++ b/retiolum/bin/check-free-retiolum-v4 @@ -1,6 +1,6 @@ #! /bin/sh netname=retiolum -myipv4=${1-10.7.7.-1} +myipv4=${1-10.243.0.-1} v4num=${myipv4##*.} printf "Retard check: " if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ]; diff --git a/retiolum/bin/create-host-tar b/retiolum/bin/create-host-tar new file mode 100755 index 00000000..48ce26d5 --- /dev/null +++ b/retiolum/bin/create-host-tar @@ -0,0 +1,15 @@ +#!/bin/sh +set -euf +if [ x"${1:-}" = "x" ];then + echo "usage: $0 DIRECTORY" + exit 1 +fi + +WEBDIR=$1 +HOSTDIR=${HOSTDIR:-../hosts} +HOSTFILE=$WEBDIR/hosts.tar.gz + +cd $(dirname $(readlink -f $0)) +rm -f $HOSTFILE +tar czf $HOSTFILE -C $HOSTDIR . +chmod a+rx $HOSTFILE diff --git a/retiolum/bin/create-supernode-tar b/retiolum/bin/create-supernode-tar new file mode 100755 index 00000000..322d428d --- /dev/null +++ b/retiolum/bin/create-supernode-tar @@ -0,0 +1,13 @@ +#!/bin/sh +set -euf +if [ x"${1:-}" = "x" ];then + echo "usage: $0 DIRECTORY" + exit 1 +fi +HOSTDIR=${HOSTDIR:-../hosts} +WEBDIR=$1 +HOSTFILE=$WEBDIR/supernodes.tar.gz +cd $(dirname $(readlink -f $0)) +rm -f $HOSTFILE +tar czf $HOSTFILE -C $HOSTDIR `python ../scripts/adv_graphgen/find_super.py |cut -d\ -f1` +chmod a+rx $HOSTFILE diff --git a/retiolum/bin/dump-graph b/retiolum/bin/dump-graph new file mode 100755 index 00000000..87539f49 --- /dev/null +++ b/retiolum/bin/dump-graph @@ -0,0 +1,9 @@ +#! /bin/sh +set -euf + +t0="`date '+%Y-%m-%d %H:%M:%S'`" +systemctl kill --signal=USR2 tincd@retiolum +sleep 5 +journalctl --since="$t0" | sed -n ' + s/.*tinc\.retiolum\[[0-9]\+\]: \([^ ]\+\) to \([^ ]\+\) at \([^ ]\+\) .*$/\1 \2 \3/p +' diff --git a/retiolum/bin/tinc_stats b/retiolum/bin/tinc_stats deleted file mode 120000 index 6a58af60..00000000 --- a/retiolum/bin/tinc_stats +++ /dev/null @@ -1 +0,0 @@ -/home/makefu/repos/krebs/retiolum/scripts/adv_graphgen/tinc_stats.py
\ No newline at end of file diff --git a/retiolum/bin/tinc_stats2json b/retiolum/bin/tinc_stats2json new file mode 120000 index 00000000..413b778c --- /dev/null +++ b/retiolum/bin/tinc_stats2json @@ -0,0 +1 @@ +../scripts/adv_graphgen/tinc_stats2json
\ No newline at end of file diff --git a/retiolum/doc/cronjob b/retiolum/doc/cronjob new file mode 100644 index 00000000..3f640311 --- /dev/null +++ b/retiolum/doc/cronjob @@ -0,0 +1,7 @@ +cron-eintrag fuer automatisches hosts-update + +ueberschreibt keine bearbeitete host-dateien +if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (curl http://euer.krebsco.de/retiolum/hosts.tar.gz | tar xzk -C /etc/tinc/retiolum/hosts/);fi + +ueberschreibt bearbeitete hostdateien +if ping -c 1 euer.krebsco.de -W 5 &>/dev/null; then (curl http://euer.krebsco.de/retiolum/hosts.tar.gz | tar xz -C /etc/tinc/retiolum/hosts/);fi diff --git a/retiolum/doc/git_checkout_only_hosts b/retiolum/doc/git_checkout_only_hosts new file mode 100644 index 00000000..2286169d --- /dev/null +++ b/retiolum/doc/git_checkout_only_hosts @@ -0,0 +1,11 @@ +# Reference +http://jasonkarns.com/blog/subdirectory-checkouts-with-git-sparse-checkout/ + +# Code + + git init painload + cd painload + git remote add -f origin https://github.com/krebscode/painload.git + git config core.sparsecheckout true + echo retiolum/hosts/ >> .git/info/sparse-checkout + git pull origin master diff --git a/retiolum/doc/highping b/retiolum/doc/highping new file mode 100644 index 00000000..e3d9a47c --- /dev/null +++ b/retiolum/doc/highping @@ -0,0 +1,2 @@ +in der tinc.conf darf nicht zu einem Host connectet werden der einen DNS namen benutzt. +wenn ein nicht erreichbarer DNS name versucht wird zu erreichen pausiert tinc jedesmal alle transfers bis der DNS-Request einen Timeout hat. diff --git a/retiolum/hosts/TodesBrot b/retiolum/hosts/TodesBrot deleted file mode 100644 index f76b72b2..00000000 --- a/retiolum/hosts/TodesBrot +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 10.243.0.12/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAzGIijXaoIRG09v5sIXyVdqdpDruPMqKJfvZUXCF/POMCZEsZ4tjd -jHHdbTfREExvSNBUxS6GaYwg/HR2R7nprzOazSN9kzp9fmFJofbCOxz6X/8O/fMM -gTBmZzYu4cfysjTD5tsrJp/dQOZ0wKpUXBOWWWDUTLM9Zo3+6Bxe/6pN+gphvl6m -ReIAwl34QkZ24mq1W4YZofU2PxLxnhtuBgXuJRfn8FDlgKKPhPpKX070J5pamzpp -1/Idxl0zTmoKeXWhJ0wY0SNeglaWgH1P2EeNUNoVEX4Egk4XQGkzOfShRG7zoJMA -tKJlNZOw/4EF3E/IM8mG1yG3NqtFlIyNYQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/albi10 b/retiolum/hosts/albi10 new file mode 100644 index 00000000..5f152a1f --- /dev/null +++ b/retiolum/hosts/albi10 @@ -0,0 +1,11 @@ +Address = 184.154.13.15 +Subnet = 10.243.0.10 +Subnet = 42:aaa9:4ba3:8c43:bdd8:2cc8:29a0:e8e6/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0Jz5rQ7NpIQWwhDsrZHlJYAnC1k1onl2ln/6CJbdV9t3gG2hlx/9 +0SEARo6sq9fftyzzZd3iY4WK7+zRXJFXHsLmDa6mq8Mme7Yv+YHZoHPTm9c3tN3v +laiV/qAdoi/sv43DCo7JywI2lTW1pPxuitXuud2ajd7GXuCoRqFRqLtaURorVKkW +4j9UGpMKrEa+CV9wP5jZ57RSPQ7aMq8D4GiMqKDgUeCZnvXxpYWDOEdGNlpuUcWt +/erC6u50/vnjUkkHx66OmkZe5AX5MmwNp2q4zC4sTh/BRhqk27AmNl5wbp0kL7/B +hg+r0F8ckrdLc21sSU36lUIeeFa/S+A06QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/also b/retiolum/hosts/also deleted file mode 100644 index 59a251a7..00000000 --- a/retiolum/hosts/also +++ /dev/null @@ -1,12 +0,0 @@ -Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 -Subnet = 23.42.0.1/16 -Subnet = 10.243.0.50/32 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry -Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ -llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF -wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz -bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM -w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/casino b/retiolum/hosts/casino new file mode 100644 index 00000000..e35691c3 --- /dev/null +++ b/retiolum/hosts/casino @@ -0,0 +1,11 @@ +Subnet = 10.243.0.233 +Subnet = 42:3c1f:ea16:e181:7ab2:c51a:8892:7fb7/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAzmZ7x4HVpW8RC3ZkwmNKY/6VGlMKQbpBQtmrUzV1XFxKWZRhH3VI +NOqlfVpTEaRTorht7R8F1aw9psDDUcg7yuQFcUdoXxBJxwbc1h0FKyZZr5kAIfpS +ObE0rbBRRqJVAWgztpQAalWC95D73y/+tpHnQ+LRFq9IWeX5+QobaSym1oG4Y0Jz +STSbw2ksjH8CuWHS5TjZr50Nyx6cH99HABDnadxhLBtQriJPSYRYdWyp7tYrW3jd +As28mxkyFj0sFV3IJ/bYfZD9KSGg1KjQu+c73xKOBUhNtSHFjUzN5myYGd/nWCw8 +0PUReLrWC1ZHYPzqiwelTHcNJ3UcojpO9wIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer index 391705c5..d2240575 100644 --- a/retiolum/hosts/euer +++ b/retiolum/hosts/euer @@ -1,4 +1,4 @@ -Address = euer.krebsco.de +#Address = euer.krebsco.de Address = 84.23.67.119 Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128 Subnet = 10.243.0.95/32 diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch deleted file mode 100644 index d23f98f2..00000000 --- a/retiolum/hosts/filebitch +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b/128 -Subnet = 10.243.131.98/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAoqTUa54dkplzU6IqWdvCiGM8FLpZ6X6AmgGgl5r9RZ+Af08iy4Js -FPdco+1Lj5OthXJnd5Xx8cO5qQx5CRzUN59ec8o0jxQOBZ5EpuN42RLMmQNBJWm7 -moVpEDuPQTHQrlyvsYwXOx1+T4rvSnG7hldiHoCL4XVn8FpZLPMXL5alGHSuNuYq -dG++5LtPpmRLOg0Pwlk3nVfJpKKn4u2FVmhmxe9CdV9c5B5Ze0nVH6sekaG0gXzX -ktoJG83/yc2XYhn+rel4kvLFyP/XqdAxsO6v7mpmQVNgsppqm2A9unDacTfOG//z -2O+/dHkkW7ukOfk2Tr6z/CSDDxySMzx2NwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/filebitchin b/retiolum/hosts/filebitchin new file mode 100644 index 00000000..cd67b1ab --- /dev/null +++ b/retiolum/hosts/filebitchin @@ -0,0 +1,10 @@ +Subnet = 10.243.221.149 +Subnet = 42:9efb:ae54:fdbf:6ec1:6167:6aab:a41e +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqtid32pdLNTOasAf8JW16SmmFJmwx/3PucO2Bpo34dDYWFm5uxyH +MYDTYDXLFRioiWGX2b1/5x7Oqjn0hP3FPuSAWPpyWEspMNmrpwZ1iA3hxQJEvQav +juBQzh18f6JJow+SoosiAfdr9pSoosZEKKbcwiWZ3od05BdKnogQ7bJI1mjSC0xb +9zAtlEKXhtmS8SJAyWKPQjC3coHlWoRq61zsI3/20074mUbFHsXj3jZPgn4Dc2RV +BYx+ZDGviIMhQEKXn9C3VFfVrLZbgheE5xiKFkqRMTWwlbNH/MXwNsrlJq3uAy9H +YuJhTY5XxUjkwCVky5m9QYbxEpl4hlvpnQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso deleted file mode 100644 index 3700cec5..00000000 --- a/retiolum/hosts/iiso +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128 -Subnet = 10.243.0.37/32 -Compression = 9 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx -ry4gbKEH57GPn11IOPP1AKQcz7SfW7EwvUS8U1IZgkQq8BuuD3oGBQxOqwnOwzVN -+XKSZjUfmT/Uf81PHfWE52BfbitI+SBTi0m9cIuhgyYRAjD7We97ogkWDogBXKvC -p1YYH44wcLte7lzWmId9hNOJtTu4KnCVgtXi/DYVLvuofrEk28DhhRSFiun4dkN6 -qMl8ZWOILOhUVSZN+cx/dslCwoog1FuEj7TyuhJFj8yoWIdI4xUGugzmV6npzTvU -bLkcVfuQQYlIV9D7YYPyEFB11U6mifZ5uwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/incept b/retiolum/hosts/incept index 1ff5365b..348e44b1 100644 --- a/retiolum/hosts/incept +++ b/retiolum/hosts/incept @@ -1,5 +1,5 @@ Address = 77.95.224.63 -Address = incept.krebsco.de +#Address = incept.krebsco.de Address = 2a00:7b80:3008:3::fafc:241 Subnet = 10.243.0.174 Subnet = 42:a2fc:1c89:65c7:6e60:1f62:eaf9:e9b6/128 diff --git a/retiolum/hosts/juhulian b/retiolum/hosts/juhulian new file mode 100644 index 00000000..d9da75aa --- /dev/null +++ b/retiolum/hosts/juhulian @@ -0,0 +1,11 @@ +Subnet = 10.243.0.38 +Subnet = 42:449f:b00a:e973:514c:3e9f:97ed:aac2/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnNyOsNItOzNQndheZ3ppOMWvIOuO1wgLXArINS1ORcgIAJmLpqDI +whsZFCVifwAXsdeBJyyZOPZrc2PQ4F3KB9ByX6PQ9jqAhun1aE9SDDqp+woOrTlP +BtJ/8zAmRhrfak61TxpeTndLk95xOLaCwvS2P4SJLIcyutTbbFdBCqpu7cFUGOOP +qCKLX7/mv2L+GNmQAnWZ5HwXQzBS6gNaNIcQ8mPCUAIZgRU2T83x/tnyH1RlATK2 +lYUWRM0ie+dRMhiDcwmmZrwYl8wzyvuBPEr/p8ZBM2tua8GlQzJUJl44AiAcx3w9 +0EB5MIRL5Qb0yBvXD0yR+bDizqvhd40LvQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/khackplug b/retiolum/hosts/khackplug new file mode 100644 index 00000000..c149d93b --- /dev/null +++ b/retiolum/hosts/khackplug @@ -0,0 +1,11 @@ +Subnet = 10.243.217.107 +Subnet = 42:ebe3:90b0:539a:6ef0:0910:b724:00b1 + │ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvytShP1vgYLDYJhiC26Vc1/cVJOptUnuyTc8Id9vkCkgHZRpKs3T +jO2KRaQMDWMXfXkMfVp84/2Q85hpUzYqXQHaNzitg9nHGR2n+a6zfwNKWAm6n2WK +AMsPf1weamzs6EfCm5WztqenoHKNUxpzXVyLJES/WK6e5ba7FEpszZx+ydoc5GjL +kezqch5p+U/J2JoUx3aIpQuWvc0i/4KYOuGzlWgUYLNyqL1m3gBkahiPuOtzf9Ul +EP8QY/GQa1HTFuhLS0Y5nVjZvWnjVVEloXbq9SD2I2fc4GD4+F8wtFMsJyEF2qxY +XfSLTlpHaJbSBNiopQyWG62RZda/p0yq3QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/laqueus b/retiolum/hosts/laqueus index cf4ecad5..0bdef307 100644 --- a/retiolum/hosts/laqueus +++ b/retiolum/hosts/laqueus @@ -1,5 +1,5 @@ -Subnet = 42:0:0:0:0:0:0:1a1a/128
-Subnet = 10.243.0.12/32
+Subnet = 42:0:0:0:0:0:0:1a1a/128 +Subnet = 10.243.0.12/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAy9lnH4qDSYeNbpzpcQyq2LzzxkVy2N1vGgKkVttzx0cgMvyRm3aX diff --git a/retiolum/hosts/minikrebs b/retiolum/hosts/minikrebs index ad7278e2..b0d60558 100644 --- a/retiolum/hosts/minikrebs +++ b/retiolum/hosts/minikrebs @@ -1,5 +1,5 @@ Subnet = 10.243.1.1/32 -Subnet = 42:0:0:0:0:0:1:1/128 +#Subnet = 42:0:0:0:0:0:1:1/128 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA0fu8F+XJ6hHsIj8QtdSZIhE+Ae2sEIY4dHcnHbCOeHJlOQQDJrme frmG65BX4BMcClUyhvvMwlZIerFwsJoEwa39lB3/Y58OwSS9cNCZTShQPbyVy5wo diff --git a/retiolum/hosts/muhbaasu b/retiolum/hosts/muhbaasu index d758fef2..83fb3933 100644 --- a/retiolum/hosts/muhbaasu +++ b/retiolum/hosts/muhbaasu @@ -1,5 +1,5 @@ Address = 217.160.206.154 -Address = muhbaasu.de +#Address = muhbaasu.de Subnet = 10.243.0.200 Subnet = 42:3f88:faa3:ae13:6ff7:13ee:17d7:421a/128 diff --git a/retiolum/hosts/nomic b/retiolum/hosts/nomic new file mode 100644 index 00000000..f418233c --- /dev/null +++ b/retiolum/hosts/nomic @@ -0,0 +1,10 @@ +Subnet = 10.243.0.110/32 +Subnet = 42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+ +qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw +Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu +5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a +OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA +Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg deleted file mode 100644 index c267b582..00000000 --- a/retiolum/hosts/oxberg +++ /dev/null @@ -1,11 +0,0 @@ -Address = 84.23.80.172 -Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128 -Subnet = 42.160.213.134/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA57j66efrYrB7jlBVu6XD6433n/j1QL86KI/l7BCVTE11mJrElElc -YSAOB44arnFurSlU8RZIZAC4gnScmDnjJqCqudxps4wO0JTPqUCvUXkaZQ1fUf7W -H00K05Jkrr6xFHyDwZNrU4uitBfMuAXlUE2A0sFLJiBmFLMSS0abaUg0ALRwFsMI -5ftLHZPMV/TwUollCHQTfwMiMGo28WBm+nYvY+nUZRu3sx8HPLskYWmvt9giu7eo -iQCDee/bHym5Ax9vETpCrkZITq2MJtQdJX46iwvlgKxsV7VkCXAtmU3lMLyTSeRX -582RdmjFP2DdTPEulbL2YyfXVuLs0QIiRQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico index 8fc732b8..b08b450d 100644 --- a/retiolum/hosts/pico +++ b/retiolum/hosts/pico @@ -1,4 +1,4 @@ -Address = pu11.de +Address = 78.111.78.33 Subnet = 10.243.0.102/32 Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pigstarter b/retiolum/hosts/pigstarter index 838d9587..6904f4e0 100644 --- a/retiolum/hosts/pigstarter +++ b/retiolum/hosts/pigstarter @@ -1,5 +1,5 @@ Address = 5.45.180.187 -Address = pigstarter.de +#Address = pigstarter.de Subnet = 10.243.0.153 Subnet = 42:9143:b4c0:f981:6030:7aa2:8bc5:4110/128 -----BEGIN RSA PUBLIC KEY----- diff --git a/retiolum/hosts/rubus b/retiolum/hosts/rubus new file mode 100644 index 00000000..0ba98c0d --- /dev/null +++ b/retiolum/hosts/rubus @@ -0,0 +1,11 @@ +Subnet = 10.243.137.174 +Subnet = 42:7941:278b:bd29:f0ab:9c09:e5e9:7965 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAznS+XyF278SXTVgK9OG8SDu+pffDZtBeYfyyNHAVt/2EeE3cfIJZ +3iBXMcD8/yelCWMY6S+MNNnP+KqyCCVuG8rvhpMjB/RGzqLFSTLZoQOmC/O9S3i3 +TKKr4zxyBxjSFAPSOeHbrERAyREg/GNrLxX/SzT/yOgRDjZLA1Z5CgunXVeiB7BF +9jL1U6AahFD/6NzaPAc4+mSAQJzGw4P5TeVvAlhf96x5I0sBc09Vu87sL9NJOpi8 +hqWYhLWjZF4CRusjV3SL9kUj668CZO1S9Ooe3FO37Pa0fftDLQekCpBDrtoNr6LW +O2BYBEXsQn5ooZgAysm7mi9Hbdc3dPl5/QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/xso b/retiolum/hosts/xso deleted file mode 100644 index 1f035a78..00000000 --- a/retiolum/hosts/xso +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:fb16:96ad:c849:f5d4:2170:103d:e86b/128 -Subnet = 42.124.174.80/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA1p1WG0yDOku0u8XPzN2BAcrkVeR11c8Si3sz2BNoYPitdA2wW/TE -mHjGw4Dxt1Q+lWmxtsNnV2x5IoZBSIovS8Tuj4O6mVTmgSJSta988gzmeImQksb6 -+/d4LQmqc6/u24sKrWEPQ7sCpb5sPGr1K1yLNtAnD7pt3rGiX/VK/SKBYKpB5wGf -snRHB5fj/4yc5M7YjQI+TO0jTKdlf9B4JrRX/DhbmZ9n/EPGREGUgrDyi66Jk8ea -yRyCg/5UcHD6z74ZN6Is4bbQXZaQ4S61r+JmFebsC2CxkZ20jayDBRKcQL6yH0ZZ -a1rAdUqyh894vNctn52GAp7P96dhwAnwEQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/openwrt/tinc-up b/retiolum/openwrt/tinc-up deleted file mode 100755 index 3b8bb978..00000000 --- a/retiolum/openwrt/tinc-up +++ /dev/null @@ -1,19 +0,0 @@ -# source: krebscode/painload/retiolum/scripts/tinc_setup/tinc-up - -dirname="`dirname "$0"`" - -conf=$dirname/tinc.conf - -name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf` - -host=$dirname/hosts/$name - -addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host` -if [ "$addr4" != '' ];then - ifconfig $INTERFACE $addr4 - route add -net 10.243.0.0 netmask 255.255.0.0 dev retiolum -else - addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host` - ifconfig $INTERFACE $addr4 - route add -net 42.0.0.0 netmask 255.0.0.0 dev retiolum -fi diff --git a/retiolum/openwrt/updater b/retiolum/openwrt/updater deleted file mode 100755 index 4dbc7d78..00000000 --- a/retiolum/openwrt/updater +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /etc/tinc/retiolum/hosts -wget http://vpn.miefda.org/hosts.tar.gz -tar xzf hosts.tar.gz -rm hosts.tar.gz -tincd -n retiolum -kHUP diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 5533c722..d3ce8f86 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -4,11 +4,14 @@ echo "`date` begin all graphs" >> /tmp/build_graph cd $(dirname $(readlink -f $0)) PATH=$PATH:../../../util/bin/ - export LOG_FILE=/var/log/retiolum.log + export LOG_FILE=/var/log/syslog + export TINC_LEGACY=true + EXTERNAL_FOLDER=/var/www/euer.krebsco.de/graphs/retiolum + INTERNAL_FOLDER=/var/www/euer/graphs/retiolum begin=`timer` export GRAPHITE_HOST="no_omo" - (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& - (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& + (./anonytize.sh $EXTERNAL_FOLDER && echo "`date` anonytize done" >> /tmp/build_graph)& + (./sanitize.sh $INTERNAL_FOLDER && echo "`date` sanitize done" >> /tmp/build_graph)& # wait graphitec "retiolum.graph.buildtime" "$(timer $begin)" >> /tmp/build_graph echo "`date` end all graphs" >> /tmp/build_graph diff --git a/retiolum/scripts/adv_graphgen/anonytize.sh b/retiolum/scripts/adv_graphgen/anonytize.sh index d49793cb..b31f4dbb 100755 --- a/retiolum/scripts/adv_graphgen/anonytize.sh +++ b/retiolum/scripts/adv_graphgen/anonytize.sh @@ -11,7 +11,7 @@ TYPE2=png OPENER=/bin/true DOTFILE=`mktemp` trap 'rm $DOTFILE' INT TERM -sudo LOG_FILE=$LOG_FILE python tinc_stats.py |\ +sudo -E python tinc_stats2json |\ python parse_tinc_anon.py> $DOTFILE diff --git a/retiolum/scripts/adv_graphgen/find_super.py b/retiolum/scripts/adv_graphgen/find_super.py new file mode 100644 index 00000000..df01734e --- /dev/null +++ b/retiolum/scripts/adv_graphgen/find_super.py @@ -0,0 +1,50 @@ +#!/usr/bin/python + +def find_super(path="/etc/tinc/retiolum/hosts"): + import os + import re + + needle_addr = re.compile("Address\s*=\s*(.*)") + needle_port = re.compile("Port\s*=\s*(.*)") + for f in os.listdir(path): + with open(path+"/"+f) as of: + addrs = [] + port = "655" + + for line in of.readlines(): + + addr_found = needle_addr.match(line) + if addr_found: + addrs.append(addr_found.group(1)) + + port_found = needle_port.match(line) + if port_found: + port = port_found.group(1) + + if addrs : yield (f ,[(addr ,int(port)) for addr in addrs]) + +def check_super(path="/etc/tinc/retiolum/hosts"): + from socket import socket,AF_INET,SOCK_STREAM + for host,addrs in find_super(path): + valid_addrs = [] + for addr in addrs: + try: + s = socket(AF_INET,SOCK_STREAM) + s.settimeout(3) + s.connect(addr) + #print("success connecting %s:%d"%(addr)) + s.settimeout(None) + s.close() + valid_addrs.append(addr) + except Exception as e: + pass + #print("cannot connect to %s:%d"%(addr)) + if valid_addrs: yield (host,valid_addrs) + + +if __name__ == "__main__": + """ + usage + """ + for host,addrs in check_super(): + print host,addrs diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py index e0bea913..21c36e0f 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py @@ -15,7 +15,7 @@ try: sys.stderr.write("connecting to %s:%d"%(host,port)) s.connect((host,port)) except Exception as e: - print >>sys.stderr, "Cannot connect to graphite: " + str(e) + sys.stderr.write( "Cannot connect to graphite: " + str(e)) """ TODO: Refactoring needed to pull the edges out of the node structures again, it should be easier to handle both structures""" DUMP_FILE = "/krebs/db/availability" @@ -151,4 +151,4 @@ try: msg = '%s.graph.anon_build_time %d %d\r\n' % (g_path,((end-begin)*1000),end) s.send(msg) s.close() -except Exception as e: print >>sys.stderr, e +except Exception as e: pass diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index 16f4f795..76a3ffcd 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -2,6 +2,7 @@ # -*- coding: utf8 -*- from BackwardsReader import BackwardsReader import sys,json +from find_super import check_super try: from time import time import socket @@ -16,10 +17,13 @@ try: except Exception as e: sys.stderr.write("Cannot connect to graphite: %s\n" % str(e)) -supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] +supernodes= [ ] +for supernode,addr in check_super(): + supernodes.append(supernode) """ TODO: Refactoring needed to pull the edges out of the node structures again, it should be easier to handle both structures""" DUMP_FILE = "/krebs/db/availability" + def write_digraph(nodes): """ writes the complete digraph in dot format @@ -53,8 +57,7 @@ def write_stat_node(nodes): try: msg = '%s.num_nodes %d %d\r\n' %(g_path,num_nodes,begin) s.send(msg) - #print >>sys.stderr, msg - except Exception as e: print sys.stderr,e + except Exception as e: pass #except: pass for k,v in nodes.iteritems(): num_conns+= len(v['to']) @@ -82,8 +85,7 @@ def generate_stats(nodes): jlines.append(jline) lines_to_use -=1 - except Exception,e: - sys.stderr.write(str(e)) + except Exception,e: sys.stderr.write(str(e)) for k,v in nodes.iteritems(): conns = v.get('to',[]) for c in conns: #sanitize weights @@ -169,7 +171,11 @@ def write_node(k,v): for addr in v.get('internal-ip',['¯\\\\(°_o)/¯']): node += "internal:"+addr+"\\l" node +="\"" - if k in supernodes: + + # warning if node only has one connection + if v['num_conns'] == 1: + node += ",fillcolor=red" + elif k in supernodes: node += ",fillcolor=steelblue1" #node +=",group=\""+v['external-ip'].replace(".","")+"\"" node += "]" diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index c46662f3..45d29a22 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -11,7 +11,7 @@ TYPE2=png OPENER=/bin/true DOTFILE=`mktemp` trap 'rm $DOTFILE' INT TERM -sudo LOG_FILE=$LOG_FILE python tinc_stats.py |\ +sudo -E python tinc_stats2json |\ python parse_tinc_stats.py > $DOTFILE diff --git a/retiolum/scripts/adv_graphgen/tinc_stats.py b/retiolum/scripts/adv_graphgen/tinc_stats2json index d0d47aff..ede19b26 100755 --- a/retiolum/scripts/adv_graphgen/tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/tinc_stats2json @@ -1,13 +1,17 @@ #!/usr/bin/python -from BackwardsReader import BackwardsReader +import subprocess import os import re import sys import json -TINC_NETWORK = os.environ.get("TINC_NETWORK","retiolum") -os.environ["LOG_FILE"] + +TINC_NETWORK =os.environ.get("TINC_NETWORK","retiolum") + +# is_legacy is the parameter which defines if the tinc config files are handled old fashioned (parse from syslog), +# or if the new and hip tincctl should be used +is_legacy= os.environ.get("TINC_LEGACY",False) SYSLOG_FILE = os.environ.get("LOG_FILE","/var/log/everything.log") @@ -21,11 +25,14 @@ BEGIN_EDGES = "Edges:" END_EDGES = "End of edges." def get_tinc_block(log_file): - """ returns an iterateable block from the given log file (syslog) """ + """ returns an iterateable block from the given log file (syslog) + This function became obsolete with the introduction of tincctl + """ + from BackwardsReader import BackwardsReader tinc_block = [] in_block = False bf = BackwardsReader(log_file) - BOL = re.compile(".*tinc.retiolum\[[0-9]+\]: ") + BOL = re.compile(".*tinc.%s\[[0-9]+\]: " % TINC_NETWORK) while True: line = bf.readline() if not line: @@ -44,6 +51,37 @@ def get_tinc_block(log_file): break return reversed(tinc_block) +def parse_new_input(): + nodes = {} + pnodes = subprocess.Popen(["tincctl","-n",TINC_NETWORK,"dump","reachable","nodes"], stdout=subprocess.PIPE).communicate()[0] + #pnodes = subprocess.check_output(["tincctl","-n",TINC_NETWORK,"dump","reachable","nodes"]) + for line in pnodes.split('\n'): + if not line: continue + l = line.split() + nodes[l[0]]= { 'external-ip': l[2], 'external-port' : l[4] } + psubnets = subprocess.check_output(["tincctl","-n",TINC_NETWORK,"dump","subnets"]) + for line in psubnets.split('\n'): + if not line: continue + l = line.split() + try: + if not nodes[l[2]].get('internal-ip',False): + nodes[l[2]]['internal-ip'] = [] + nodes[l[2]]['internal-ip'].append(l[0].split('#')[0]) + except KeyError: + pass # node does not exist (presumably) + pedges = subprocess.check_output(["tincctl","-n",TINC_NETWORK,"dump","edges"]) + for line in pedges.split('\n'): + if not line: continue + l = line.split() + try: + if not nodes[l[0]].has_key('to') : + nodes[l[0]]['to'] = [] + nodes[l[0]]['to'].append( + {'name':l[2],'addr':l[4],'port':l[6],'weight' : l[10] }) + except KeyError: + pass #node does not exist + return nodes + def parse_input(log_data): nodes={} for line in log_data: @@ -68,7 +106,6 @@ def parse_input(log_data): if END_EDGES in line : break l = line.replace('\n','').split() - if not nodes[l[0]].has_key('to') : nodes[l[0]]['to'] = [] nodes[l[0]]['to'].append( @@ -78,6 +115,10 @@ def parse_input(log_data): if __name__ == '__main__': import subprocess,time - subprocess.call(["pkill","-SIGUSR2", "tincd"]) - time.sleep(1) - print json.dumps(parse_input((get_tinc_block(SYSLOG_FILE)))) + if is_legacy: + subprocess.call(["pkill","-SIGUSR2", "tincd"]) + time.sleep(1) + print json.dumps(parse_input((get_tinc_block(SYSLOG_FILE)))) + else: + print json.dumps(parse_new_input()) + diff --git a/retiolum/scripts/github_listener/INSTALL b/retiolum/scripts/github_listener/INSTALL new file mode 100644 index 00000000..20c0845c --- /dev/null +++ b/retiolum/scripts/github_listener/INSTALL @@ -0,0 +1,13 @@ +# HowTo + + useradd -r tinc + mkdir -p /opt/ + git init github_listener + git remote add -f origin https://github.com/krebscode/painload.git + git config core.sparsecheckout true + echo retiolum/hosts/ >> .git/info/sparse-checkout + git pull origin master + ln -s $static_painload/retiolum/{scripts,bin} retiolum/ + cp scripts/github_listener/github_listener.conf /etc/supervisor/conf.d/ + cd .. + chown tinc:tinc -R github_listener diff --git a/retiolum/scripts/github_listener/README b/retiolum/scripts/github_listener/README new file mode 100644 index 00000000..57c30896 --- /dev/null +++ b/retiolum/scripts/github_listener/README @@ -0,0 +1,22 @@ +GITHUB_LISTENER +=============== + +The github listener is an application which listens for github post-receive +hook calls and runs a script each time currently the github listener is +used to create a tarball of all nodes in the retiolum darknet. the current +tarball can be retrieved at http://euer.krebsco.de/retiolum/hosts.tar + +listen script +============= + +the listen script is a quick hack which runs netcat in an e-loop together +with a "logger" command to signalise successful tarball generation. + + +github_listener.conf +=================== +the supervisor config file + +References +========== +also see //retiolum/doc/git_checkout_only_hosts diff --git a/retiolum/scripts/github_listener/github_listener.conf b/retiolum/scripts/github_listener/github_listener.conf new file mode 100644 index 00000000..c4f0a8b6 --- /dev/null +++ b/retiolum/scripts/github_listener/github_listener.conf @@ -0,0 +1,5 @@ +[program:github_listener] +command=nc -lvv -p 5432 -c "./handle_request /opt/github_listener/retiolum/hosts /var/www/euer.krebsco.de/retiolum/" +user=tinc +directory=/krebs/retiolum/scripts/github_listener/ +autorestart=true diff --git a/retiolum/scripts/github_listener/handle_request b/retiolum/scripts/github_listener/handle_request new file mode 100755 index 00000000..5b42524a --- /dev/null +++ b/retiolum/scripts/github_listener/handle_request @@ -0,0 +1,23 @@ +#!/bin/sh +# Possible Shell Vars +# WEBDIR +# HOSTFOLDER +set -euf +if [ "x${2:-}" = x ];then + echo "usage: $0 HOSTDIRECTORY WEBDIRECTORY" + exit 1 +fi +export HOSTDIR=${1:-../../hosts} +WEBDIR=${2:-/var/www/euer.krebsco.de/retiolum/} +echo "sorry for keeping you waiting, please be patient" + +cd $(dirname $(readlink -f $0)) + +cd "$HOSTDIR" +git pull origin master >&2 +echo "First step done" +cd - >&2 +../../bin/create-supernode-tar $WEBDIR +echo "almost done..." +../../bin/create-host-tar $WEBDIR +echo "Thank you for your patience!" diff --git a/retiolum/scripts/tinc_setup/bootstrap.sh b/retiolum/scripts/tinc_setup/bootstrap.sh deleted file mode 100644 index 32919e7d..00000000 --- a/retiolum/scripts/tinc_setup/bootstrap.sh +++ /dev/null @@ -1,11 +0,0 @@ -if [ ! `id -u` -eq "0" ] -then - echo "not root, trying sudo" - exec sudo "$0" "$@" -fi - -mkdir -p /etc/tinc/retiolum/ -git clone git://github.com/miefda/retiolum.git /etc/tinc/retiolum/hosts -cd /etc/tinc/retiolum/hosts/.scripts - -echo "use the build script of your choice from /etc/tinc/retiolum/hosts/.scripts" diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index a6b50b8a..a72d2b8b 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -45,7 +45,7 @@ then then printf 'select v4 subnet ip (1-255): ' read v4num - until $MYBIN/check-free-retiolum-v4 $v4num; do + until $MYBIN/check-free-retiolum-v4 10.243.0.$v4num; do echo "your're an idiot!" printf 'select unused v4 subnet ip (1-255): ' read v4num @@ -63,8 +63,8 @@ fi cat>tinc.conf<<EOF Name = $myname ConnectTo = euer -ConnectTo = oxberg -ConnectTo = pa_sharepoint +ConnectTo = albi10 +ConnectTo = pigstarter ConnectTo = supernode Device = /dev/net/tun EOF @@ -73,7 +73,7 @@ if [ ! -e rsa_key.priv ] then echo "creating new keys" tincd -n $netname -K - python ${CURR}/write_channel.py $myname || \ + $MYBIN/announce_pubkey $myname || \ echo "cannot write public key to IRC, you are on your own. Good Luck" else echo "key files already exist, skipping" diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh new file mode 100755 index 00000000..85a61be8 --- /dev/null +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -0,0 +1,407 @@ +#!/bin/sh + +#get sudo +if test "${nosudo-false}" != true -a `id -u` != 0; then + echo "we're going sudo..." >&2 + exec sudo -E "$0" "$@" + exit 23 # go to hell +fi +set -euf +# +SUBNET4=${SUBNET4:-10.243} +SUBNET6=${SUBNET6:-42} +TEMPDIR=${TEMPDIR:-auto} +TINCDIR=${TINCDIR:-auto} + +if type hostname >/dev/null ;then SYSHOSTN=${HOSTNAME:-$(hostname)} +elif type uci >/dev/null ;then SYSHOSTN=$(uci get system.@system[0].hostname) +elif [ -e /etc/hostname ] ;then SYSHOSTN=$(cat /etc/hostname) +else SYSHOSTN="unknown" +fi + +#overwrite `found` hostname +HOSTN=${HOSTN:-$SYSHOSTN} +NETNAME=${NETNAME:-retiolum} +MASK4=${MASK4:-16} +MASK6=${MASK6:-16} +RMASK=${RMASK:-255.255.0.0} +URL=${URL:-http://euer.krebsco.de/retiolum/hosts.tar.gz} +SURL=${SURL:-http://euer.krebsco.de/retiolum/supernodes.tar.gz} + +IRCCHANNEL=${IRCCHANNEL:-"#krebsco"} +IRCSERVER=${IRCSERVER:-"irc.freenode.net"} +IRCPORT=${IRCPORT:-6667} + +OS=${OS:-0} + +IP4=${IP4:-0} +IP6=${IP6:-0} + +RAND4=1 +RAND6=1 + +usage() +{ +cat << EOF +usage $0 options +This script gets you into the KREBS Darknet +all parameters are optional + +Options: + -h Show this message(haha) + -4 \$ipv4 specify an ip(version 4), this also disables random ip mode, default is random + -6 \$ipv6 specify an ip(version 6), this also disables random ip mode, default is random + -s \$SUBNET Choose another Subnet(version4), default is 10.243 + -x \$SUBNET Choose another Subnet(version6), default is 42 + -m \$MASK Choose another Subnet Mask(version4), default is 16 + -j \$MASK Choose another Subnet Mask(version6), default is 16 + -t \$DIR Choose another Temporary directory, default is /tmp/tinc-install-fu + -o \$HOST Choose another Hostname, default is your system hostname + -n \$NET Choose another tincd netname,this also specifies the path to your tinc config, default is retiolum + -u \$URL specify another hostsfiles.tar.gz url, default is http://euer.krebsco.de/retiolum/hosts.tar.gz + -l \$OS specify an OS, numeric parameter.0=Automatic 1=Linux 2=Android, disables automatic OS-finding, default is 0 + -r \$ADDR give the node an reachable remote address, ipv4 or dns +EOF +} + +#convert hostmask to subnetmask only version 4 +host2subnet() +{ + NEEDDOTSINSUB=$(expr 3 - $( echo $SUBNET4 | tr -C -d . | wc -c)) + case $NEEDDOTSINSUB in + 3) FULLSUBNET=$SUBNET4.0.0.0 ;; + 2) FULLSUBNET=$SUBNET4.0.0 ;; + 1) FULLSUBNET=$SUBNET4.0 ;; + 0) FULLSUBNET=$SUBNET4 ;; + *) echo "cannot read subnet" && exit 1;; + esac +} + +#check if ip is valid ipv4 function +check_ip_valid4() +{ + if [ "$(echo $1 | awk -F"\." ' $0 ~ /^([0-9]{1,3}\.){3}[0-9]{1,3}$/ && $1 <=255 && $2 <= 255 && $3 <= 255 && $4 <= 255 ' 2>/dev/null)" == "$1" ] && [ ${1:0:${#SUBNET4}} == $SUBNET4 ] + then + return 0 + else + return 1 + fi +} + +#check if ip is valid ipv6 function +check_ip_valid6() +{ + if [ "$(echo $1 | awk -F"." ' $0 ~ /^([0-9a-fA-F]{1,4}\:){7}[0-9a-fA-F]{1,4}$/' 2>/dev/null)" == $1 ] && [ ${1:0:${#SUBNET6}} == $SUBNET6 ] + then + return 0 + else + return 1 + fi +} + +#check if ip is taken function +check_ip_taken() +{ + if grep -q -r -E "$1(#|/)" $TEMPDIR/hosts/ ;then + return 1 + else + return 0 + fi +} + +#if hostname is taken, count upwards until it isn't taken function +get_hostname() +{ + TSTFILE=$TEMPDIR/hosts/$1 + LCOUNTER=0 + if test -e $TSTFILE; then + while test -e $TSTFILE; do + let LCOUNTER=LCOUNTER+1 + TSTFILE=$TEMPDIR/hosts/$1$LCOUNTER + done + HOSTN=$1$LCOUNTER + else + HOSTN=$1 + fi +} + +#os autodetection +find_os() +{ + if grep -qe 'Linux' /etc/*release 2>/dev/null || grep -qe 'Linux' /etc/issue 2>/dev/null; then + OS=1 + elif type getprop >/dev/null; then + OS=2 + elif test -e /etc/openwrt_release; then + OS=3 + else + echo "Cannot determine your operating system, falling back to Linux" + OS=1 + fi +} + +if [ $IP4 -eq 0 ]; then + RAND4=1 +elif ! check_ip_valid4 $IP4; then + echo 'ip4 is invalid' + exit 1 +fi +if [ $IP6 -eq 0 ]; then + RAND6=1 +elif ! check_ip_valid6 $IP6; then + echo 'ip6 is invalid' + exit 1 +fi + +#find OS +if [ $OS -eq 0 ]; then + find_os +fi + +#check if everything is installed +if ! type awk >/dev/null; then + echo "Please install awk" + exit 1 +fi + +if ! type curl >/dev/null; then + if ! type wget >/dev/null; then + echo "Please install curl or wget" + exit 1 + else + LOADER='wget -O-' + fi +else + LOADER=curl +fi + +if ! $(ping -c 1 -W 5 euer.krebsco.de 1>/dev/null) ;then + echo "Cant reach euer, check if your internet is working" + exit 1 +fi + + +#parse options +while getopts "h4:6:s:x:m:j:t:o:n:u:l:" OPTION +do + case $OPTION in + h) + usage + exit 1 + ;; + 4) + IP4=$OPTARG + RAND4=0 + if ! check_ip_valid4 $IP4; then echo "ipv4 is invalid" && exit 1; fi + ;; + 6) + IP6=$OPTARG + RAND6=0 + if ! check_ip_valid6 $IP6; then echo "ipv6 is invalid" && exit 1; fi + ;; + s) + SUBNET4=$OPTARG + ;; + x) + SUBNET6=$OPTARG + ;; + m) + MASK4=$OPTARG + ;; + j) + MASK6=$OPTARG + ;; + t) + TEMPDIR=$OPTARG + ;; + o) + HOSTN=$OPTARG + ;; + n) + NETNAME=$OPTARG + ;; + u) + URL=$OPTARG + if $(! curl -s --head $URL | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null); then + echo "url not reachable" + exit 1 + fi + ;; + l) + OS=$OPTARG + if ! [ "$(echo $OS | awk -F"." ' $0 ~ /^[0-2]$/' )" == $OS ]; then + echo "invalid input for OS" + exit 1 + fi + ;; + r) + ADDR=$OPTARG + ;; + + esac +done + +#check for OS +if [ $OS -eq 0 ]; then + find_os +fi + +#check if everything is installed +if [ $OS -eq 2 ]; then + if ! test -e /data/data/org.poirsouille.tinc_gui/files/tincd; then + echo "Please install tinc-gui" + exit 1 + else + TINCBIN=/data/data/org.poirsouille.tinc_gui/files/tincd + if [ $TINCDIR = 'auto' ]; then TINCDIR=/usr/local/etc/tinc ;fi + if [ $TEMPDIR = 'auto' ]; then TEMPDIR=/data/secure/data ;fi + fi +else + if ! type tincd >/dev/null; then + echo "Please install tinc" + exit 1 + else + TINCBIN=tincd + if [ $TINCDIR = 'auto' ]; then TINCDIR=/etc/tinc ;fi + if [ $TEMPDIR = 'auto' ]; then TEMPDIR=/tmp/tinc-install-fu ;fi + fi +fi + +#generate full subnet information for v4 + +#test if tinc directory already exists +if test -e $TINCDIR/$NETNAME; then + echo "tinc config directory $TINCDIR/$NETNAME does already exist. (backup and) delete config directory and restart" + exit 1 +fi + +#get tinc-hostfiles +mkdir -p $TEMPDIR/hosts +$LOADER $URL | tar zx -C $TEMPDIR/hosts/ + +#check for free ip +#version 4 +until check_ip_taken $IP4; do + if [ $RAND4 -eq 1 ]; then + IP4="$SUBNET4.$(( $(head /dev/urandom | tr -dc "123456789" | head -c3) %255)).$(( $(head /dev/urandom | tr -dc "123456789" | head -c3) %255))" + else + printf 'choose new ip: ' + read IP4 + while ! check_ip_valid4 $IP4; do + printf 'the ip is invalid, retard, choose a valid ip: ' + read IP4 + done + fi +done + +#version 6 +until check_ip_taken $IP6; do + if [ $RAND6 -eq 1 ]; then + NETLENGTH=$(expr $(expr 128 - $MASK6) / 4) + IP6="$SUBNET6$(head /dev/urandom | tr -dc "0123456789abcdef" | head -c$NETLENGTH | sed 's/..../:&/g')" #todo: generate ip length from hostmask + else + printf 'ip taken, choose new ip: ' + + read IP6 + while ! check_ip_valid6 $IP6; do + printf 'the ip is invalid, retard, choose a valid ip: ' + read IP6 + done + fi +done + + +#check for free hostname +get_hostname $HOSTN + + +#create the configs +mkdir -p $TINCDIR/$NETNAME +cd $TINCDIR/$NETNAME + +if [ $OS -eq 3 ]; then + mkdir hosts + $LOADER $SURL | tar xz -C hosts/ +else + mv $TEMPDIR/hosts ./ +fi + +rm -r $TEMPDIR || echo "$TEMPDIR does not exist, skipping removal" + +echo "Subnet = $IP4" > hosts/$HOSTN +echo "Subnet = $IP6" >> hosts/$HOSTN + +cat>tinc.conf<<EOF +Name = $HOSTN +Device = /dev/net/tun + +#newer tinc features +LocalDiscovery = yes +AutoConnect = 3 + +#ConnectTos +ConnectTo = supernode +ConnectTo = pigstarter +ConnectTo = pico +EOF + +host2subnet $MASK4 + +#check if ip is installed +if type ip >/dev/null; then + echo 'dirname="`dirname "$0"`"' > tinc-up + echo '' >> tinc-up + echo 'conf=$dirname/tinc.conf' >> tinc-up + echo '' >> tinc-up + echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up + echo '' >> tinc-up + echo 'host=$dirname/hosts/$name' >> tinc-up + echo '' >> tinc-up + echo 'ip link set $INTERFACE up' >> tinc-up + echo '' >> tinc-up + echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up + echo 'ip -4 addr add $addr4 dev $INTERFACE' >> tinc-up + echo "ip -4 route add $FULLSUBNET/$MASK4 dev \$INTERFACE" >> tinc-up + echo '' >> tinc-up + echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up + echo 'ip -6 addr add $addr6 dev $INTERFACE' >> tinc-up + echo "ip -6 route add $SUBNET6::/$MASK6 dev \$INTERFACE" >> tinc-up +else + echo 'dirname="`dirname "$0"`"' > tinc-up + echo '' >> tinc-up + echo 'conf=$dirname/tinc.conf' >> tinc-up + echo '' >> tinc-up + echo 'name=$(sed -n "s|^ *Name *= *\([^ ]*\) *$|\\1|p" $conf)' >> tinc-up + echo '' >> tinc-up + echo 'host=$dirname/hosts/$name' >> tinc-up + echo '' >> tinc-up + echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *$|\\\\1|p\" \$host)" >> tinc-up + echo 'ifconfig $INTERFACE $addr4' >> tinc-up + echo "route add -net $FULLSUBNET netmask $RMASK dev \$INTERFACE " >> tinc-up +fi + +#fix permissions +chmod +x tinc-up +chown -R root:root . + +#generate keys with tinc +if type tincctl >/dev/null; then + yes | tincctl -n $NETNAME generate-keys + cat rsa_key.pub >> hosts/$HOSTN +else + yes | $TINCBIN -n $NETNAME -K +fi + +#write to irc-channel +NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)" + +( echo "NICK $NICK"; + echo "USER $NICK $IRCSERVER bla : $NICK"; + echo "JOIN $IRCCHANNEL"; + sleep 23; + sed "s/^\(.*\)/PRIVMSG $IRCCHANNEL : \1/" hosts/$HOSTN; + sleep 5; ) | telnet $IRCSERVER $IRCPORT + + +# finish what you have begun! +tincd -n $NETNAME diff --git a/retiolum/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py deleted file mode 100644 index 8299fa8d..00000000 --- a/retiolum/scripts/tinc_setup/write_channel.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/python -import random, sys, time, socket -try: - myname=sys.argv[1] -except: - print("you are made of stupid") - exit (23) - -CHANNEL = '#krebsco' -HOST='irc.freenode.net' -FILE="/etc/tinc/retiolum/hosts/"+myname -PORT=6667 -NICK= myname+"_"+str(random.randint(23,666)) - -print("Connecting...") -sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM) -sock.connect((HOST,PORT)) -print(NICK) -sock.send("NICK %s\r\n" % NICK) -sock.send("USER %s %s bla : %s\r\n" %(NICK,HOST,NICK)) -sock.send("JOIN %s\r\n" % CHANNEL) -time.sleep(23) -f = open(FILE,'r') -a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] -time.sleep(5) #because irc is so lazy -print("closing socket") -sock.close() diff --git a/too_old/mechanize_tickets.py b/sandbox/27c3_ticket_grabber/mechanize_tickets.py index 1f12a996..1f12a996 100644 --- a/too_old/mechanize_tickets.py +++ b/sandbox/27c3_ticket_grabber/mechanize_tickets.py diff --git a/DNA/README.md b/sandbox/DNA/README.md index 9de84746..9de84746 100644 --- a/DNA/README.md +++ b/sandbox/DNA/README.md diff --git a/DNA/linux/LICENSE b/sandbox/DNA/linux/LICENSE index 94a9ed02..94a9ed02 100644 --- a/DNA/linux/LICENSE +++ b/sandbox/DNA/linux/LICENSE diff --git a/DNA/linux/Makefile b/sandbox/DNA/linux/Makefile index 2ed4c9fb..2ed4c9fb 100644 --- a/DNA/linux/Makefile +++ b/sandbox/DNA/linux/Makefile diff --git a/DNA/linux/README.md b/sandbox/DNA/linux/README.md index 0b6885e2..0b6885e2 100644 --- a/DNA/linux/README.md +++ b/sandbox/DNA/linux/README.md diff --git a/DNA/linux/TODO b/sandbox/DNA/linux/TODO index fd0d927f..fd0d927f 100644 --- a/DNA/linux/TODO +++ b/sandbox/DNA/linux/TODO diff --git a/DNA/linux/krebs.c b/sandbox/DNA/linux/krebs.c index df319c63..df319c63 100644 --- a/DNA/linux/krebs.c +++ b/sandbox/DNA/linux/krebs.c diff --git a/sandbox/README.md b/sandbox/README.md new file mode 100644 index 00000000..fbf92cd9 --- /dev/null +++ b/sandbox/README.md @@ -0,0 +1,5 @@ +# Sandbox + +Sandbox contains all the projects which are either not yet production ready +(too-new), or broken and old (too-old). Some of the code might work, but most +won't do the right thing on your system, so try them with caution. diff --git a/cobra/README b/sandbox/cobra/README.md index 145ecd14..f9bb8026 100644 --- a/cobra/README +++ b/sandbox/cobra/README.md @@ -16,18 +16,19 @@ that contains an index.{js,sh,py,etc.} file. like your sh's PATH ## example: cobra as some kind of make -$ echo $COBRA_PATH -. -$ ls . -foo/ bar/ baz/ -$ cat foo/cobra.json -{ "deps": "bar", "baz" } -$ cat bar/cobra.json -No such file or directory -$ cat baz/cobra.json -No such file or directory -$ cobra foo -[cobra bar] -[cobra baz] -[cobra foo] -$ exit + + $ echo $COBRA_PATH + . + $ ls . + foo/ bar/ baz/ + $ cat foo/cobra.json + { "deps": "bar", "baz" } + $ cat bar/cobra.json + No such file or directory + $ cat baz/cobra.json + No such file or directory + $ cobra foo + [cobra bar] + [cobra baz] + [cobra foo] + $ exit diff --git a/cobra/hello/index.sh b/sandbox/cobra/hello/index.sh index df2dea7c..df2dea7c 100644 --- a/cobra/hello/index.sh +++ b/sandbox/cobra/hello/index.sh diff --git a/cobra/index.sh b/sandbox/cobra/index.sh index 1118a823..1118a823 100755 --- a/cobra/index.sh +++ b/sandbox/cobra/index.sh diff --git a/hyper/README.md b/sandbox/hyper/README.md index d8fe9d67..d8fe9d67 100644 --- a/hyper/README.md +++ b/sandbox/hyper/README.md diff --git a/hyper/influx/http/index.js b/sandbox/hyper/influx/http/index.js index 346dde3b..346dde3b 100755 --- a/hyper/influx/http/index.js +++ b/sandbox/hyper/influx/http/index.js diff --git a/hyper/process/Makefile b/sandbox/hyper/process/Makefile index bbc1c2fb..bbc1c2fb 100644 --- a/hyper/process/Makefile +++ b/sandbox/hyper/process/Makefile diff --git a/hyper/process/main.go b/sandbox/hyper/process/main.go index 214dade9..214dade9 100644 --- a/hyper/process/main.go +++ b/sandbox/hyper/process/main.go diff --git a/hyper/process/spawn b/sandbox/hyper/process/spawn index 65e94d86..65e94d86 100755 --- a/hyper/process/spawn +++ b/sandbox/hyper/process/spawn diff --git a/hyper/process/src/hyper/process/Makefile b/sandbox/hyper/process/src/hyper/process/Makefile index 7ecda716..7ecda716 100644 --- a/hyper/process/src/hyper/process/Makefile +++ b/sandbox/hyper/process/src/hyper/process/Makefile diff --git a/hyper/process/src/hyper/process/process.go b/sandbox/hyper/process/src/hyper/process/process.go index 18cf55fb..18cf55fb 100644 --- a/hyper/process/src/hyper/process/process.go +++ b/sandbox/hyper/process/src/hyper/process/process.go diff --git a/hyper/process/test/bc.json b/sandbox/hyper/process/test/bc.json index 5b3b0721..5b3b0721 100644 --- a/hyper/process/test/bc.json +++ b/sandbox/hyper/process/test/bc.json diff --git a/hyper/sink/index.js b/sandbox/hyper/sink/index.js index b556b88d..b556b88d 100644 --- a/hyper/sink/index.js +++ b/sandbox/hyper/sink/index.js diff --git a/json/sh/json.sh b/sandbox/json/sh/json.sh index 79f8529a..79f8529a 100755 --- a/json/sh/json.sh +++ b/sandbox/json/sh/json.sh diff --git a/json/sh/test.json b/sandbox/json/sh/test.json index 9b4c6312..9b4c6312 100644 --- a/json/sh/test.json +++ b/sandbox/json/sh/test.json diff --git a/meta/bin/update b/sandbox/meta/bin/update index 9b2289ad..9b2289ad 100755 --- a/meta/bin/update +++ b/sandbox/meta/bin/update diff --git a/meta/install b/sandbox/meta/install index 07096b34..07096b34 100755 --- a/meta/install +++ b/sandbox/meta/install diff --git a/roboctl/index.js b/sandbox/roboctl/index.js index ac92c969..ac92c969 100644 --- a/roboctl/index.js +++ b/sandbox/roboctl/index.js diff --git a/roboctl/lib/irc.js b/sandbox/roboctl/lib/irc.js index 5f904a74..5f904a74 100644 --- a/roboctl/lib/irc.js +++ b/sandbox/roboctl/lib/irc.js diff --git a/retiolum/scripts/tinc_multicast/retiolum b/sandbox/tinc_multicast/retiolum index 1d6b775f..1d6b775f 100755 --- a/retiolum/scripts/tinc_multicast/retiolum +++ b/sandbox/tinc_multicast/retiolum diff --git a/retiolum/scripts/tinc_multicast/retiolum.py b/sandbox/tinc_multicast/retiolum.py index 8cf57471..8cf57471 100755 --- a/retiolum/scripts/tinc_multicast/retiolum.py +++ b/sandbox/tinc_multicast/retiolum.py diff --git a/zoneminder/Makefile b/sandbox/zoneminder/Makefile index 27302715..27302715 100644 --- a/zoneminder/Makefile +++ b/sandbox/zoneminder/Makefile diff --git a/zoneminder/zmdc.pl-LD_PRELOAD.patch b/sandbox/zoneminder/zmdc.pl-LD_PRELOAD.patch index b00fc673..b00fc673 100644 --- a/zoneminder/zmdc.pl-LD_PRELOAD.patch +++ b/sandbox/zoneminder/zmdc.pl-LD_PRELOAD.patch diff --git a/zoneminder/zoneminder.conf b/sandbox/zoneminder/zoneminder.conf index 1eec6fd9..1eec6fd9 100644 --- a/zoneminder/zoneminder.conf +++ b/sandbox/zoneminder/zoneminder.conf diff --git a/streams/README b/streams/README deleted file mode 100644 index 82300c24..00000000 --- a/streams/README +++ /dev/null @@ -1,10 +0,0 @@ -streams done right - -deepmix,groovesalad and radiotux are now init.d scrips which can be -started and stopped. - -scripts are dumped into /etc/init.d and groovesalad will be set as -default via update-rc.d - -mplayer will be started in a tmux session either by creating a new -session or starting a new window inside the first existing one diff --git a/streams/streams b/streams/streams deleted file mode 100755 index 80c654ad..00000000 --- a/streams/streams +++ /dev/null @@ -1,131 +0,0 @@ -#! /bin/bash -set -euf - -stream_file=/tmp/krebs.stream.current - -HERE=$(dirname $(readlink -f $0)) -URLS=`cat $HERE/stream.db` -CURRENT_STREAM="no stream" #will be set when calling `status` -if [ ! `id -u` -eq "0" ]; then - exec sudo "$0" "$@" -fi - -#if [ ! `id -u` -eq "0" ]; then -# echo "we are going sudo..." -# exec sudo "$0" "$@" -#fi - -function start() { - # start the given stream von $1 - REQ=$1 - tmux start-server - if status &>/dev/null ; then - echo "!! Stream already running!" - exit 1 - fi - - if echo "$URLS" | while read URL NAME; do - if [ "$NAME" = "$REQ" ];then - tmux new-session -s streams -n streams -d " - while sleep 1; do - echo $NAME > $stream_file - mplayer $URL - done - " - echo "** $REQ started" - exit 1 - fi - done; then - echo "!! Stream '$REQ' not found!" - exit 1 - fi -} -function stop() -{ - #stops every stream - if status &>/dev/null; then - status | cut -d\ -f2 | xargs printf "** killing %s\n" - tmux kill-session -t streams 2>/dev/null || echo "!! killing session failed" - else - echo "** no stream running"; - return 1 - fi -} - -function status() -{ - #tmux has-session -t streams 2>/dev/null - #RET=$? - - #tmux list-sessions 2>/dev/null - #return $RET - EV="`ps -ef | grep mplayer`" - if echo "$URLS" | while read URL NAME; do - if [ "`echo "$EV" | grep \"$URL\"`" ] ;then - echo "** $NAME running ($URL)" - exit 1 - fi - done; then - echo "** no stream running" - return 1 - else - return 0 - fi -} -function current() -{ - - return 1 -} -function list() -{ - echo "$URLS" | while read URL NAME ; do - echo "$NAME : $URL" - done - -} - -function shorthelp() -{ - echo "start|stop|restart|status|list [audio stream]" -} -function longhelp() -{ - B=`basename $0` - echo -n "Usage: $B " - shorthelp - echo "[32;1m get all available streams with [31;1;4m'/$B list'[m -Examples: - $B list - $B start groove - $B restart deepmix - $B status - $B stop" -} - - -case "$1" in - start) - start ${2-"`test -f $stream_file && cat $stream_file`"} - ;; - stop) - stop - ;; - (switch|restart) - stop - start $2 - ;; - status) - status - exit $? - ;; - list) - list - ;; - (--help) - shorthelp - ;; - *) - longhelp - ;; -esac diff --git a/morse/COPYING b/util/morse/COPYING index d28e4178..d28e4178 100644 --- a/morse/COPYING +++ b/util/morse/COPYING diff --git a/morse/Makefile b/util/morse/Makefile index 2afa845e..2afa845e 100644 --- a/morse/Makefile +++ b/util/morse/Makefile diff --git a/morse/README b/util/morse/README index 67951c00..67951c00 100644 --- a/morse/README +++ b/util/morse/README diff --git a/morse/morse.sh b/util/morse/morse.sh index c84538ca..c84538ca 100755 --- a/morse/morse.sh +++ b/util/morse/morse.sh diff --git a/tts/bin/alberto b/util/tts/bin/alberto index 6947e393..6947e393 120000 --- a/tts/bin/alberto +++ b/util/tts/bin/alberto diff --git a/tts/bin/anjali b/util/tts/bin/anjali index 6947e393..6947e393 120000 --- a/tts/bin/anjali +++ b/util/tts/bin/anjali diff --git a/tts/bin/arnaud b/util/tts/bin/arnaud index 6947e393..6947e393 120000 --- a/tts/bin/arnaud +++ b/util/tts/bin/arnaud diff --git a/tts/bin/audrey b/util/tts/bin/audrey index 6947e393..6947e393 120000 --- a/tts/bin/audrey +++ b/util/tts/bin/audrey diff --git a/tts/bin/charles b/util/tts/bin/charles index 6947e393..6947e393 120000 --- a/tts/bin/charles +++ b/util/tts/bin/charles diff --git a/tts/bin/claire b/util/tts/bin/claire index 6947e393..6947e393 120000 --- a/tts/bin/claire +++ b/util/tts/bin/claire diff --git a/tts/bin/crystal b/util/tts/bin/crystal index 6947e393..6947e393 120000 --- a/tts/bin/crystal +++ b/util/tts/bin/crystal diff --git a/tts/bin/francesca b/util/tts/bin/francesca index 6947e393..6947e393 120000 --- a/tts/bin/francesca +++ b/util/tts/bin/francesca diff --git a/tts/bin/giovanni b/util/tts/bin/giovanni index 6947e393..6947e393 120000 --- a/tts/bin/giovanni +++ b/util/tts/bin/giovanni diff --git a/tts/bin/juliette b/util/tts/bin/juliette index 6947e393..6947e393 120000 --- a/tts/bin/juliette +++ b/util/tts/bin/juliette diff --git a/tts/bin/klara b/util/tts/bin/klara index 6947e393..6947e393 120000 --- a/tts/bin/klara +++ b/util/tts/bin/klara diff --git a/tts/bin/lauren b/util/tts/bin/lauren index 6947e393..6947e393 120000 --- a/tts/bin/lauren +++ b/util/tts/bin/lauren diff --git a/tts/bin/mike b/util/tts/bin/mike index 6947e393..6947e393 120000 --- a/tts/bin/mike +++ b/util/tts/bin/mike diff --git a/tts/bin/reiner b/util/tts/bin/reiner index 6947e393..6947e393 120000 --- a/tts/bin/reiner +++ b/util/tts/bin/reiner diff --git a/tts/bin/rich b/util/tts/bin/rich index 6947e393..6947e393 120000 --- a/tts/bin/rich +++ b/util/tts/bin/rich diff --git a/tts/bin/rosa b/util/tts/bin/rosa index 6947e393..6947e393 120000 --- a/tts/bin/rosa +++ b/util/tts/bin/rosa diff --git a/tts/names b/util/tts/names index 576c74e5..576c74e5 100644 --- a/tts/names +++ b/util/tts/names diff --git a/webcams/cam1.sh b/webcams/cam1.sh deleted file mode 100755 index 9cf709e6..00000000 --- a/webcams/cam1.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -mplayer tv:// -tv driver=v4l2:width=320:height=240:device=/dev/video0 |
