Changeset 416

Show
Ignore:
Timestamp:
21/08/2007 19:28:00 (1 year ago)
Author:
nextime
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • wrt/whiterussian/packages/webifmdx/tags/mercury/MDXBUILD

    r398 r416  
    1 
     1
  • wrt/whiterussian/packages/webifmdx/tags/mercury/Makefile

    r393 r416  
    55PKG_NAME:=webifmdx 
    66PKG_VERSION:=0.1.mercury 
    7 PKG_RELEASE:=3 
     7PKG_RELEASE:=4 
    88 
    99PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     
    120120        find $(IDIR_WEBIFMDX) -name .svn | xargs rm -rf 
    121121        find $(IDIR_WEBIFMDX) -name *~ | xargs rm -rf 
     122        # we don't need those files (yet), so remove from package 
     123        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-asterisk.sh 
     124        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-usb.sh 
     125        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-wwaninfo.sh 
    122126        $(IPKG_BUILD) $(IDIR_WEBIFMDX) $(PACKAGE_DIR) 
  • wrt/whiterussian/packages/webifmdx/tags/mercury/files/etc/init.d/S90webifmdx_firmwareid

    r386 r416  
    1111 
    1212firmware_name="Medianix WRT"     
    13 fi 
    1413firmware_subtitle="With CaptiveSpot Extensions" 
    1514 
  • wrt/whiterussian/packages/webifmdx/tags/mercury/files/www/cgi-bin/webifmdx/status-openvpn.sh

    r379 r416  
    4444                        fi 
    4545                ;; 
     46      mdx) 
     47         if [ ! -f "/etc/openvpn/client.key" ]; then 
     48            ERROR="@TR<<status_openvpn_Err_client_keyfile_missing#Error, client keyfile is missing!>>" 
     49         fi 
     50         if [ ! -f "/etc/openvpn/client.crt" ]; then 
     51            ERROR="@TR<<status_openvpn_Err_client_cert_missing#Error, client certificate is missing!>>" 
     52         fi 
     53         if [ ! -f "/etc/openvpn/ca.crt" ]; then 
     54            ERROR="@TR<<status_openvpn_Err_root_cert#Error, root certificate is missing!>>" 
     55         fi 
     56         [ -f "/etc/openvpn/shared.key" ] || 
     57            ERROR="@TR<<status_openvpn_Err_keyfile_missing#Error, keyfile is missing!>>" 
     58         ;; 
    4659                *) 
    4760                        ERROR="@TR<<status_openvpn_Err_unknown_authtype#error in OpenVPN configuration, unknown authtype>>" 
  • wrt/whiterussian/packages/webifmdx/trunk/MDXBUILD

    r398 r416  
    1 
     1
  • wrt/whiterussian/packages/webifmdx/trunk/Makefile

    r393 r416  
    55PKG_NAME:=webifmdx 
    66PKG_VERSION:=0.1 
    7 PKG_RELEASE:=4 
     7PKG_RELEASE:=5 
    88 
    99PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     
    120120        find $(IDIR_WEBIFMDX) -name .svn | xargs rm -rf 
    121121        find $(IDIR_WEBIFMDX) -name *~ | xargs rm -rf 
     122        # we don't need those files (yet), so remove from package 
     123        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-asterisk.sh 
     124        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-usb.sh 
     125        rm -f $(IDIR_WEBIFMDX)/www/cgi-bin/webifmdx/status-wwaninfo.sh 
    122126        $(IPKG_BUILD) $(IDIR_WEBIFMDX) $(PACKAGE_DIR) 
  • wrt/whiterussian/packages/webifmdx/trunk/files/etc/init.d/S90webifmdx_firmwareid

    r388 r416  
    1111 
    1212firmware_name="Medianix WRT"     
    13 fi 
    1413firmware_subtitle="With CaptiveSpot Extensions" 
    1514 
  • wrt/whiterussian/packages/webifmdx/trunk/files/www/cgi-bin/webifmdx/status-openvpn.sh

    r379 r416  
    4444                        fi 
    4545                ;; 
     46      mdx) 
     47         if [ ! -f "/etc/openvpn/client.key" ]; then 
     48            ERROR="@TR<<status_openvpn_Err_client_keyfile_missing#Error, client keyfile is missing!>>" 
     49         fi 
     50         if [ ! -f "/etc/openvpn/client.crt" ]; then 
     51            ERROR="@TR<<status_openvpn_Err_client_cert_missing#Error, client certificate is missing!>>" 
     52         fi 
     53         if [ ! -f "/etc/openvpn/ca.crt" ]; then 
     54            ERROR="@TR<<status_openvpn_Err_root_cert#Error, root certificate is missing!>>" 
     55         fi 
     56         [ -f "/etc/openvpn/shared.key" ] || 
     57            ERROR="@TR<<status_openvpn_Err_keyfile_missing#Error, keyfile is missing!>>" 
     58         ;; 
    4659                *) 
    4760                        ERROR="@TR<<status_openvpn_Err_unknown_authtype#error in OpenVPN configuration, unknown authtype>>"