slitaz-forge rev 614

server consoles, new deb package for rpi
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Mar 27 12:48:49 2016 +0200 (2016-03-27)
parents 161f44d78d53
children 4838a2a16700
files arm/rpi/index.html pangolin/web/index.php tank/files/etc/init.d/shellinabox tank/files/etc/lighttpd/vhosts.conf tank/web/index.php
line diff
     1.1 --- a/arm/rpi/index.html	Sun Mar 27 00:56:26 2016 -0300
     1.2 +++ b/arm/rpi/index.html	Sun Mar 27 12:48:49 2016 +0200
     1.3 @@ -108,8 +108,8 @@
     1.4  </p>
     1.5  
     1.6  <div class="box-dl">
     1.7 -	<a href="http://mirror.slitaz.org/arm/rpi/slitaz-20140329-1_armhf.deb"
     1.8 -		>slitaz-20140329-1_armhf.deb</a> (34 Mb) does not support RPI model 2
     1.9 +	<a href="http://mirror.slitaz.org/arm/rpi/slitaz-20140329-2_armhf.deb"
    1.10 +		>slitaz-20140329-2_armhf.deb</a> (22 Mb)
    1.11  </div>
    1.12  
    1.13  <h2>Remote control</h2>
     2.1 --- a/pangolin/web/index.php	Sun Mar 27 00:56:26 2016 -0300
     2.2 +++ b/pangolin/web/index.php	Sun Mar 27 12:48:49 2016 +0200
     2.3 @@ -38,7 +38,7 @@
     2.4  			<ul>
     2.5  				<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
     2.6  				<li><a href="http://mirror1.slitaz.org/">Main Mirror</a></li>
     2.7 -				<li><a href="http://pangolin.slitaz.org:4200/">Console</a></li>
     2.8 +				<li><a href="http://pangolin.slitaz.org/console/">Console</a></li>
     2.9  			</ul>
    2.10  		</div>
    2.11  		<div class="left_box">
     3.1 --- a/tank/files/etc/init.d/shellinabox	Sun Mar 27 00:56:26 2016 -0300
     3.2 +++ b/tank/files/etc/init.d/shellinabox	Sun Mar 27 12:48:49 2016 +0200
     3.3 @@ -41,7 +41,7 @@
     3.4  	eval shellinaboxd --background=$pidfile --disable-ssl \
     3.5  		--css=/usr/share/shellinabox/object.css \
     3.6  		--user-css 10px:-/usr/share/shellinabox/10px.css,12px:-/usr/share/shellinabox/12px.css,14px:-/usr/share/shellinabox/14px.css,16px:+/usr/share/shellinabox/16px.css \
     3.7 -		-s /login:LOGIN $(services_arg)
     3.8 +		--localhost-only --no-beep -s /:LOGIN
     3.9  	;;
    3.10  stop)
    3.11  	[ -s $pidfile ] && kill $(cat $pidfile)
     4.1 --- a/tank/files/etc/lighttpd/vhosts.conf	Sun Mar 27 00:56:26 2016 -0300
     4.2 +++ b/tank/files/etc/lighttpd/vhosts.conf	Sun Mar 27 12:48:49 2016 +0200
     4.3 @@ -9,6 +9,18 @@
     4.4    accesslog.filename = "/var/log/lighttpd/tank.slitaz.org-access.log"
     4.5    include "awstats.conf"
     4.6    index-file.names += ( "index.php" )
     4.7 +  proxy.server = (
     4.8 +	"/console" => (( "host" => "127.0.0.1", "port" => 4200 ))
     4.9 +  )
    4.10 +  auth.backend = "htpasswd"
    4.11 +  auth.backend.htpasswd.userfile = "/home/slitaz/www/ns/httpd.users"
    4.12 +  auth.require = ( "/console" =>
    4.13 +    (
    4.14 +    "method" => "basic",
    4.15 +    "realm" => "Use your mercurial login to use the console service",
    4.16 +    "require" => "valid-user"
    4.17 +    )
    4.18 +  )
    4.19  }
    4.20  
    4.21  # slitaz.pro
    4.22 @@ -66,7 +78,7 @@
    4.23  
    4.24  # slitaz.me
    4.25  #
    4.26 -$HTTP["host"] =~ "slitaz\.me$" {
    4.27 +$HTTP["host"] =~ "(slitaz\.me$|me\.slitaz\.org$|mypizza\.slitaz\.org$)" {
    4.28    server.document-root = "/home/slitaz/www/me"
    4.29    server.errorlog = "/var/log/lighttpd/slitaz.me-error.log"
    4.30    accesslog.filename = "/var/log/lighttpd/slitaz.me-access.log"
    4.31 @@ -188,3 +200,36 @@
    4.32      ".cgi" => "/bin/sh"
    4.33    )
    4.34  }
    4.35 +
    4.36 +# mirror.slitaz.org (main 46.105.127.17 ks385316.kimsufi.com)
    4.37 +#
    4.38 +$HTTP["host"] =~ "mirror.*\.slitaz\.org$" {
    4.39 +	url.redirect = (
    4.40 +	 "^/packages/cooking/(.*)" => "http://mirror1.slitaz.org/packages/cooking/$1",
    4.41 +	 "^/iso/rolling/(.*)" => "http://mirror1.slitaz.org/iso/rolling/$1",
    4.42 +	 "^/(.*)" => "http://mirror.switch.ch/ftp/mirror/slitaz/$1"
    4.43 +	)
    4.44 +	server.document-root = "/home/slitaz/www/boot"
    4.45 +}
    4.46 +
    4.47 +# ns.slitaz.org
    4.48 +#
    4.49 +$HTTP["host"] =~ "ns\.slitaz\.org$" {
    4.50 +  cgi.assign = (
    4.51 +    ".cgi" => "/bin/sh"
    4.52 +  )
    4.53 +  index-file.names = ( "index.cgi" )
    4.54 +  server.document-root = "/home/slitaz/www/ns"
    4.55 +  server.errorlog = "/var/log/lighttpd/ns.slitaz.org-error.log"
    4.56 +  accesslog.filename = "/var/log/lighttpd/ns.slitaz.org-access.log"
    4.57 +  auth.backend = "htpasswd"
    4.58 +  auth.backend.htpasswd.userfile = "/home/slitaz/www/ns/httpd.users"
    4.59 +  auth.require = ( "" =>
    4.60 +    (
    4.61 +    "method" => "basic",
    4.62 +    "realm" => "Use your mercurial login to use the by.slitaz.org dynamic name server",
    4.63 +    "require" => "valid-user"
    4.64 +    )
    4.65 +  )
    4.66 +}
    4.67 +
     5.1 --- a/tank/web/index.php	Sun Mar 27 00:56:26 2016 -0300
     5.2 +++ b/tank/web/index.php	Sun Mar 27 12:48:49 2016 +0200
     5.3 @@ -23,7 +23,7 @@
     5.4  			<ul>
     5.5  				<li><a href="http://tank.slitaz.org/">Tank Server</a></li>
     5.6  				<li><a href="http://mirror1.slitaz.org/">Main Mirror</a></li>
     5.7 -				<li><a href="http://tank.slitaz.org:4200/">Console</a></li>
     5.8 +				<li><a href="http://tank.slitaz.org/console/">Console</a></li>
     5.9  			</ul>
    5.10  		</div>
    5.11  		<div class="left_box">