Changeset 524

Timestamp:

08/16/10 20:30:05 (22 months ago)

Author:

scriado

Message:

Modificación de nw_conf para poder cambiar user o password del uhttpd.
Se agrega nueva conf para backfire versión r22673

Location:

branches/nightwing-backfire

Files:

• nightwing/usr/bin/nw_conf (modified) (2 diffs)
• openwrt/trunk/.config (modified) (11 diffs)

branches/nightwing-backfire/nightwing/usr/bin/nw_conf

@@ -170 +170 @@
                 if [[ "${#HTTPPASS}" -gt 7 && "${#HTTPPASS}" -lt 64 ]];
                 then
-                        echo "/:$HTTPUSER:$(httpd -m $HTTPPASS)" > /etc/httpd.conf
+                        echo "/:$HTTPUSER:$(uhttpd -m $HTTPPASS)" > /etc/httpd.conf
                         HTTPD_CHANGE=1
                 else
@@ -425 +425 @@
                         echo "Do you want to change the Web access admin? [y/n]: "
                         case_httpd_access
-                        if  [ $HTTPD_CHANGE == "1" ]; then kill -9 $(pidof httpd);/etc/init.d/httpd start;fi
+                        if  [ $HTTPD_CHANGE == "1" ]; then /etc/init.d/uhttpd restart;fi
                         menu_2
                         ;;

branches/nightwing-backfire/openwrt/trunk/.config

@@ -1 +1 @@
 #
 # Automatically generated make config: don't edit
-# OpenWrt version: Backfire (r21662)
-# Thu Jun 10 22:45:59 2010
+# OpenWrt version: Backfire (r22673)
+# Mon Aug 16 17:29:19 2010
 #
 CONFIG_HAVE_DOT_CONFIG=y
@@ -225 +225 @@
 CONFIG_SHADOW_PASSWORDS=y
 # CONFIG_CLEAN_IPKG is not set
+# CONFIG_COLLECT_KERNEL_DEBUG is not set
 
 #
 # Kernel build options
 #
-CONFIG_KERNEL_DEBUG_FS=y
+# CONFIG_KERNEL_DEBUG_FS is not set
 # CONFIG_KERNEL_PROFILING is not set
 # CONFIG_KERNEL_KALLSYMS is not set
+# CONFIG_KERNEL_DEBUG_KERNEL is not set
+# CONFIG_KERNEL_DEBUG_INFO is not set
 
 #
@@ -879 +882 @@
 # CONFIG_BUSYBOX_CONFIG_FTPPUT is not set
 # CONFIG_BUSYBOX_CONFIG_HOSTNAME is not set
-CONFIG_BUSYBOX_CONFIG_HTTPD=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
 CONFIG_BUSYBOX_CONFIG_IFCONFIG=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_IFCONFIG_STATUS=y
@@ -1113 +1105 @@
 # CONFIG_PACKAGE_wide-dhcpv6-relay is not set
 # CONFIG_PACKAGE_wide-dhcpv6-server is not set
+# CONFIG_PACKAGE_6in4 is not set
 # CONFIG_PACKAGE_6scripts is not set
 # CONFIG_PACKAGE_6tunnel is not set
@@ -1340 +1333 @@
 CONFIG_PACKAGE_kmod-ipt-nat=y
 CONFIG_PACKAGE_kmod-ipt-nat-extra=y
-CONFIG_PACKAGE_kmod-ipt-nathelper=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
 # CONFIG_PACKAGE_kmod-ipt-nathelper-extra is not set
 # CONFIG_PACKAGE_kmod-ipt-queue is not set
@@ -1481 +1474 @@
 # CONFIG_PACKAGE_kmod-hostap-plx is not set
 # CONFIG_PACKAGE_kmod-lib80211 is not set
-# CONFIG_PACKAGE_kmod-libertas is not set
+# CONFIG_PACKAGE_kmod-libertas-sd is not set
+# CONFIG_PACKAGE_kmod-libertas-usb is not set
 # CONFIG_PACKAGE_kmod-mac80211 is not set
 # CONFIG_PACKAGE_kmod-mac80211-hwsim is not set
@@ -1908 +1902 @@
 # CONFIG_PACKAGE_libol is not set
 # CONFIG_PACKAGE_libopal is not set
+# CONFIG_PACKAGE_libopencdk is not set
 # CONFIG_PACKAGE_libopenh323 is not set
 # CONFIG_PACKAGE_libopenldap is not set
@@ -1981 +1976 @@
 # CONFIG_PACKAGE_zaptel-libtonezone is not set
 # CONFIG_PACKAGE_zaptel14-libtonezone is not set
-# CONFIG_PACKAGE_zlib is not set
+CONFIG_PACKAGE_zlib=y
 
 #
@@ -2558 +2553 @@
 # CONFIG_PACKAGE_ucspi-tcp is not set
 # CONFIG_PACKAGE_udp-broadcast-relay is not set
-# CONFIG_PACKAGE_uhttpd is not set
+CONFIG_PACKAGE_uhttpd=y
+# CONFIG_PACKAGE_uhttpd-mod-lua is not set
+# CONFIG_PACKAGE_uhttpd-mod-tls is not set
 # CONFIG_PACKAGE_ulogd is not set
 # CONFIG_PACKAGE_umurmur-openssl is not set
@@ -2694 +2691 @@
 
 #
+# Terminal
+#
+# CONFIG_PACKAGE_script is not set
+# CONFIG_PACKAGE_setterm is not set
+
+#
 # backup
 #
@@ -2739 +2742 @@
 # CONFIG_PACKAGE_picocom is not set
 # CONFIG_PACKAGE_setserial is not set
-# CONFIG_PACKAGE_setterm is not set
 # CONFIG_PACKAGE_alsa-utils is not set
 # CONFIG_PACKAGE_alsa-utils-tests is not set