diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 00000000..17e3b052 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,18 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 60 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 +# Issues with these labels will never be considered stale +exemptLabels: + - pinned + - enhancement + - feature request +# Label to use when marking an issue as stale +staleLabel: stale +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false diff --git a/app/css/lightsout.css b/app/css/lightsout.css index dfb92517..39987a5e 100644 --- a/app/css/lightsout.css +++ b/app/css/lightsout.css @@ -273,18 +273,17 @@ span.label.label-warning { } [class*="alert"] { - border-radius: 0px; + border-radius: .35rem; color: #d2d2d2; background-color: #202020; - border-color: #d2d2d2; - border: 1px dashed; + border: 1px solid #404040; } .close { - font-size: 18px; - font-weight: normal; - text-shadow: 0 0px 0 #202020; - opacity: 1; + font-size: 1.2em; + font-weight: 400; + text-shadow: none; + color: #d2d2d2; } .form-control, diff --git a/installers/common.sh b/installers/common.sh index ffaf76a0..d8ac9327 100755 --- a/installers/common.sh +++ b/installers/common.sh @@ -109,13 +109,6 @@ function create_hostapd_scripts() { sudo chmod 750 "$raspap_dir/hostapd/"*.sh || install_error "Unable to change file permissions" } -# Generate dnsmasq logfile -function create_dnsmasq_log() { - install_log "Creating dnsmasq logfile" - sudo touch /tmp/dnsmasq.log || install_error "Unable to create logfile /tmp/dnsmasq.log" - sudo chown dnsmasq:"$raspap_user" /tmp/dnsmasq.log || install_error "Unable to change file ownership" -} - # Generate lighttpd service control scripts function create_lighttpd_scripts() { install_log "Creating lighttpd control scripts" @@ -267,8 +260,6 @@ function default_configuration() { 'echo 1 > \/proc\/sys\/net\/ipv4\/ip_forward #RASPAP' 'iptables -t nat -A POSTROUTING -j MASQUERADE #RASPAP' 'iptables -t nat -A POSTROUTING -s 192.168.50.0\/24 ! -d 192.168.50.0\/24 -j MASQUERADE #RASPAP' - 'chown dnsmasq:www-data \/tmp\/dnsmasq.log #RASPAP' - 'chown root:www-data \/tmp\/hostapd.log #RASPAP' ) for line in "${lines[@]}"; do @@ -350,6 +341,8 @@ function patch_system_files() { "/etc/raspap/hostapd/servicestart.sh" "/etc/raspap/lighttpd/configport.sh" "/etc/raspap/openvpn/configauth.sh" + "/bin/chmod o+r /tmp/hostapd.log" + "/bin/chmod o+r /tmp/dnsmasq.log" ) # Check if sudoers needs patching @@ -464,7 +457,6 @@ function install_raspap() { download_latest_files change_file_ownership create_hostapd_scripts - create_dnsmasq_log create_lighttpd_scripts move_config_file default_configuration diff --git a/installers/enablelog.sh b/installers/enablelog.sh index 9985d626..84a714b8 100755 --- a/installers/enablelog.sh +++ b/installers/enablelog.sh @@ -1,4 +1,3 @@ #!/bin/bash /bin/sed -i 's|#DAEMON_OPTS=""|DAEMON_OPTS=" -f /tmp/hostapd.log"|' /etc/default/hostapd touch /tmp/hostapd.log -chmod o+r /tmp/hostapd.log diff --git a/templates/dhcp/logging.php b/templates/dhcp/logging.php index 60e7166e..2a39e236 100644 --- a/templates/dhcp/logging.php +++ b/templates/dhcp/logging.php @@ -13,6 +13,7 @@ '.htmlspecialchars($log, ENT_QUOTES).''; ?> diff --git a/templates/hostapd.php b/templates/hostapd.php index 52433367..d3d7786e 100755 --- a/templates/hostapd.php +++ b/templates/hostapd.php @@ -113,6 +113,7 @@
'; } else {