wok rev 16039

busybox: Add 404.html and up config file, CSS and HTML
author Christophe Lincoln <pankso@slitaz.org>
date Sun Mar 09 10:11:06 2014 +0100 (2014-03-09)
parents 301137af7e7e
children 311ad10166ae
files busybox/stuff/httpd.conf busybox/stuff/www/httpd/404.html busybox/stuff/www/index.html busybox/stuff/www/style.css xorg-server-light/receipt
line diff
     1.1 --- a/busybox/stuff/httpd.conf	Sun Mar 09 06:29:42 2014 +0000
     1.2 +++ b/busybox/stuff/httpd.conf	Sun Mar 09 10:11:06 2014 +0100
     1.3 @@ -4,16 +4,16 @@
     1.4  H:/var/www
     1.5  
     1.6  # Allow address.
     1.7 -A:0.0.0.0/0
     1.8 +A:192.168.
     1.9  
    1.10  # File to open by default.
    1.11  #I:index.html      
    1.12  
    1.13  # Path to the 404 error page.
    1.14 -#E404:/path/404.html 
    1.15 +E404:/httpd/404.html 
    1.16  
    1.17 -# Require user root, password root on urls starting with /adm/.
    1.18 -#/adm:root:root
    1.19 +# Require user root on urls starting with /adm/. use passwd system db
    1.20 +/adm:root:*
    1.21  
    1.22  # Reverse proxy.
    1.23  #P:/url:[http://]hostname[:port]/new/path
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/busybox/stuff/www/httpd/404.html	Sun Mar 09 10:11:06 2014 +0100
     2.3 @@ -0,0 +1,28 @@
     2.4 +<!DOCTYPE html>
     2.5 +<html xmlns="http://www.w3.org/1999/xhtml">
     2.6 +<head>
     2.7 +	<title>404 Not Found</title>
     2.8 +	<meta charset="utf-8" />
     2.9 +	<link rel="stylesheet" type="text/css" href="../style.css" />
    2.10 +</head>
    2.11 +<body>
    2.12 +
    2.13 +<!-- Header -->
    2.14 +<div id="header">
    2.15 +	<h1>SliTaz Web Server</h1>
    2.16 +</div>
    2.17 +
    2.18 +<!-- Content -->
    2.19 +<div id="content">
    2.20 +<h2>404 Not Found</h2>
    2.21 +
    2.22 +<!-- End content -->
    2.23 +</div>
    2.24 +
    2.25 +<!-- Footer -->
    2.26 +<div id="footer">
    2.27 +    Copyright &copy; 2014 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
    2.28 +</div>
    2.29 +
    2.30 +</body>
    2.31 +</html>
     3.1 --- a/busybox/stuff/www/index.html	Sun Mar 09 06:29:42 2014 +0000
     3.2 +++ b/busybox/stuff/www/index.html	Sun Mar 09 10:11:06 2014 +0100
     3.3 @@ -31,7 +31,7 @@
     3.4  
     3.5  <!-- Footer -->
     3.6  <div id="footer">
     3.7 -    Copyright &copy; 2011 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
     3.8 +    Copyright &copy; 2014 <a href="http://www.slitaz.org/">SliTaz GNU/Linux</a>
     3.9  </div>
    3.10  
    3.11  </body>
     4.1 --- a/busybox/stuff/www/style.css	Sun Mar 09 06:29:42 2014 +0000
     4.2 +++ b/busybox/stuff/www/style.css	Sun Mar 09 10:11:06 2014 +0100
     4.3 @@ -1,44 +1,138 @@
     4.4 -/* CSS style for SliTaz GNU/Linux. */
     4.5 +/* CSS style for SliTaz Network (minimal version) */
     4.6  
     4.7  html { min-height: 102%; }
     4.8 -
     4.9 -body {
    4.10 -	background: #ffffff;
    4.11 -	color: black;
    4.12 -	font: 13px sans-serif, vernada, arial;
    4.13 -	margin: 0;
    4.14 -	min-width: 640px;
    4.15 +body { font: 88% sans-serif, vernada, arial; margin: 0; }
    4.16 +h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; }
    4.17 +h1 a { color: #fff; text-decoration: none; }
    4.18 +h2 { color: #444; } h3 { color: #666; font-size: 140%; }
    4.19 +a { text-decoration: underline; color: #215090; }
    4.20 +a:hover { text-decoration: none; }
    4.21 +img { border: 0pt none; vertical-align: middle; }
    4.22 +pre {
    4.23 +	overflow: auto;
    4.24 +	font-size: 98%;
    4.25  }
    4.26  
    4.27 -a { text-decoration: underline; color: #215090; }
    4.28 -a:hover { text-decoration: none; color: blue; }
    4.29 -img { border: 0pt none; vertical-align: middle; }
    4.30 -h2 { color: #444; }
    4.31 -h3 { color: #666; font-size: 140%; }
    4.32 +/* Header */
    4.33  
    4.34  #header {
    4.35 +	background: #222;
    4.36  	height: 40px;
    4.37 -	background: #351a0a;
    4.38 -	border-bottom: 8px solid #d66018;
    4.39 +	border-bottom: 4px solid #afafaf;
    4.40  }
    4.41  
    4.42  #header h1 {
    4.43  	margin: 0;
    4.44 -	padding: 8px 0 0 8px;
    4.45 -	color: white;
    4.46 -	font-size: 20px;
    4.47 +	padding: 8px 0 0 4px;
    4.48 +	width: 250px;
    4.49  }
    4.50  
    4.51 +#header h1 a { 
    4.52 +	color: white; 
    4.53 +	text-decoration: none;
    4.54 +	font-size: 20px;
    4.55 +	font-style: italic;
    4.56 +}
    4.57 +
    4.58 +#header h1 a:hover { 
    4.59 +	color: #afafaf;
    4.60 +}
    4.61 +
    4.62 +/* Header links */
    4.63 +
    4.64 +#network { 
    4.65 +	float: right; 
    4.66 +	padding: 14px 5px 0; 
    4.67 +	font-size: 12px;
    4.68 +}
    4.69 +
    4.70 +#network a, #network span {
    4.71 +	padding: 0 4px;
    4.72 +	color: #fff; 
    4.73 +	font-weight: bold;
    4.74 +	text-decoration: none;
    4.75 +}
    4.76 +
    4.77 +#network a:hover, #network span { color: #afafaf; }
    4.78 +
    4.79 +/* Logo */
    4.80 +
    4.81 +#logo {
    4.82 +	background: url(images/logo.png) no-repeat left;
    4.83 +	position: absolute;
    4.84 +	float: left;
    4.85 +	left: 0px;
    4.86 +	top: 0px;
    4.87 +	width: 40px;
    4.88 +	height: 40px;
    4.89 +}
    4.90 +
    4.91 +/* Search */
    4.92 +
    4.93 +#search {
    4.94 +	position: absolute;
    4.95 +	right: 20px;
    4.96 +	top: 60px;
    4.97 +}
    4.98 +
    4.99 +#search input[type="text"] {
   4.100 +	width: 200px;
   4.101 +	
   4.102 +	padding: 4px;
   4.103 +	margin: 4px 0px;
   4.104 +	font-size: 14px;
   4.105 +	line-height: 1.2em;
   4.106 +	background: #fefefe;
   4.107 +	border: 2px solid #afafaf;
   4.108 +	-webkit-appearance: none;
   4.109 +	-webkit-padding-end: 12px;
   4.110 +	-webkit-padding-start: 6px;
   4.111 +}
   4.112 +
   4.113 +/* Content */
   4.114 +
   4.115  #content {
   4.116 -	padding: 30px 80px;
   4.117 +	margin: 40px auto;
   4.118 +	padding: 0 20px;
   4.119  	text-align: justify;
   4.120 +	max-width: 720px;
   4.121  }
   4.122  
   4.123 +.box {
   4.124 +	padding: 6px;
   4.125 +	margin: 4px 0px;
   4.126 +}
   4.127 +
   4.128 +pre, .box {
   4.129 +	background-color: #f8f8f8;
   4.130 +	border: 1px solid #ddd;
   4.131 +}
   4.132 +
   4.133 +pre {
   4.134 +	padding: 10px;
   4.135 +}
   4.136 +
   4.137 +pre img { margin: 4px 4px 4px 0px; }
   4.138 +
   4.139 +.error { color: red; }
   4.140 +.ok { color: green; }
   4.141 +.date { color: #666; font-size: 96%; }
   4.142 +
   4.143 +/* Round corner */
   4.144 +
   4.145 +pre, img, .box, input[type="text"] {
   4.146 +	-moz-border-radius: 4px;
   4.147 +	-webkit-border-radius: 4px;
   4.148 +	border-radius: 4px;
   4.149 +}
   4.150 +
   4.151 +/* Footer */
   4.152 +
   4.153  #footer {
   4.154  	text-align: center;
   4.155 +	padding: 20px;
   4.156  	border-top: 1px solid #ddd;
   4.157 -	padding: 40px;
   4.158 -	color: #666;
   4.159 +	font-size: 90%;
   4.160  }
   4.161  
   4.162 -#footer a { color: #666; padding: 0 2px; }
   4.163 +#footer a { padding: 0 2px; }
     5.1 --- a/xorg-server-light/receipt	Sun Mar 09 06:29:42 2014 +0000
     5.2 +++ b/xorg-server-light/receipt	Sun Mar 09 10:11:06 2014 +0100
     5.3 @@ -12,18 +12,29 @@
     5.4  WEB_SITE="http://www.x.org/"
     5.5  WGET_URL="http://xorg.freedesktop.org/releases/individual/xserver/$TARBALL"
     5.6  PROVIDE="xorg-server"
     5.7 -#HOST_ARCH="i486 arm"
     5.8 +HOST_ARCH="i486 arm"
     5.9  
    5.10  DEPENDS="xorg-xkeyboard-config xorg-libpciaccess xorg-libXxf86vm \
    5.11  xorg-libXfont xorg-libXau xorg-base-fonts libgcrypt pixman udev \
    5.12 -xorg-xf86-input-evdev"
    5.13 +xorg-xf86-input-evdev libgpg-error libgcrypt freetype libxcb bzip2"
    5.14  BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev xorg-libXxf86vm-dev \
    5.15 -xorg-libXfont-dev libgcrypt-dev pixman-dev udev-dev perl flex xorg-dev-proto"
    5.16 +xorg-libXfont-dev libgpg-error-dev libgcrypt-dev pixman-dev udev-dev perl \
    5.17 +flex xorg-dev-proto freetype-dev libxcb-dev bzip2-dev"
    5.18  
    5.19  # Handle arch compilation
    5.20  case "$ARCH" in
    5.21 -	arm) BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev \
    5.22 -xorg-libXfont-dev libgcrypt-dev pixman-dev" ;;
    5.23 +	arm)
    5.24 +		#--disable-xf86vidmode
    5.25 +		BUILD_DEPENDS="xorg-libxkbfile-dev xorg-libpciaccess-dev pixman-dev \
    5.26 +xorg-util-macros xorg-libXfont-dev libgcrypt-dev xorg-resourceproto \
    5.27 +xorg-bigreqsproto xorg-xcmiscproto xorg-renderproto xorg-damageproto \
    5.28 +xorg-compositeproto xorg-xf86dgaproto  xorg-randrproto xorg-recordproto \
    5.29 +xorg-videoproto xorg-xtrans libgpg-error-dev libgcrypt-dev freetype-dev \
    5.30 +libxcb-dev bzip2-dev" 
    5.31 +		ARCH_ARGS="--disable-config-udev"
    5.32 +		ARM_LIBS="/cross/$arch/sysroot/usr/lib" ;;
    5.33 +	i?86)
    5.34 +		ARCH_ARGS="--enable-config-udev" ;;
    5.35  esac
    5.36  
    5.37  # Rules to configure and make the package.
    5.38 @@ -38,7 +49,6 @@
    5.39  		--with-serverconfig-path=/etc/X11 \
    5.40  		--enable-install-setuid \
    5.41  		--enable-xorg \
    5.42 -		--enable-config-udev \
    5.43  		--disable-config-dbus \
    5.44  		--with-fontrootdir=/usr/share/fonts \
    5.45  		--with-os-name="SliTaz GNU/Linux" \
    5.46 @@ -53,7 +63,11 @@
    5.47  		--disable-xnest \
    5.48  		--disable-xfbdev \
    5.49  		--disable-xv \
    5.50 -		$CONFIGURE_ARGS &&
    5.51 +XSERVERCFLAGS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \
    5.52 +-lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \
    5.53 +XSERVERLIBS_LIBS="-L${ARM_LIBS} -lrt -lpthread -lmd -lgcrypt -lm -lz \
    5.54 +-lcrypto -lpixman -lxkbfile -lXfont -lfreetype -lXau -lfontenc -lXdmcp" \
    5.55 +		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
    5.56  	make && make install
    5.57  }
    5.58