Merge branch 'master' of https://github.com/krebscode/painload

Conflicts:
	minikrebs

11 files changed, 0 insertions, 220 deletions

diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp b/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp
deleted file mode 100644
index 79d7bea5..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/dhcp
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 56f20aa7..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/firewall
+++ /dev/null
@@ -1,112 +0,0 @@
-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
deleted file mode 100644
index b1e678dc..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/fstab
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 7ac322a7..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/network
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index ffbe1530..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/system
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 74695b7c..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/uhttpd
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index bce01a9e..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/config/wireless
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 120000
index 9c87fc52..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/dropbear/authorized_keys
+++ /dev/null
@@ -1 +0,0 @@
-/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
deleted file mode 100644
index 9cc800dd..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/shadow
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index d406c90f..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.crt
+++ /dev/null
diff --git a/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key b/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key
deleted file mode 100644
index d5d163d2..00000000
--- a/minikrebs/profiles/rickroller_advanced/customfiles/etc/uhttpd.key
+++ /dev/null