slitaz-forge rev 112

Add cook.slitaz.org custom files
author Christophe Lincoln <pankso@slitaz.org>
date Wed Mar 14 03:12:37 2012 +0100 (2012-03-14)
parents 99a3dfd92a89
children d9fdcc8946ad
files cook/favicon.ico cook/header.html cook/style.css tank/tank
line diff
     1.1 Binary file cook/favicon.ico has changed
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/cook/header.html	Wed Mar 14 03:12:37 2012 +0100
     2.3 @@ -0,0 +1,23 @@
     2.4 +<!DOCTYPE html>
     2.5 +<html xmlns="http://www.w3.org/1999/xhtml">
     2.6 +<head>
     2.7 +	<title>SliTaz Cooker</title>
     2.8 +	<meta charset="utf-8" />
     2.9 +	<link rel="shortcut icon" href="favicon.ico" />
    2.10 +	<link rel="stylesheet" type="text/css" href="style.css" />
    2.11 +</head>
    2.12 +<body>
    2.13 +
    2.14 +<div id="header">
    2.15 +	<div id="logo"></div>
    2.16 +	<div id="network">
    2.17 +		<a href="http://mirror.slitaz.org/pkgs/?version=cooking">Database</a>
    2.18 +		<a href="http://tank.slitaz.org/graphs.php#cpu">Cpu</a>
    2.19 +		<a href="http://hg.slitaz.org/wok/">Hg</a>
    2.20 +		<a href="undigest/">Undigest</a>
    2.21 +	</div>
    2.22 +	<h1><a href="cooker.cgi">SliTaz Cooker</a></h1>
    2.23 +</div>
    2.24 +
    2.25 +<!-- Content -->
    2.26 +<div id="content">
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/cook/style.css	Wed Mar 14 03:12:37 2012 +0100
     3.3 @@ -0,0 +1,116 @@
     3.4 +/* CSS style for SliTaz Cooker */
     3.5 +
     3.6 +body { font: 13px sans-serif, vernada, arial; margin: 0; }
     3.7 +h1 { margin: 0; padding: 8px; color: #fff; font-size: 20px; }
     3.8 +h1 a { color: #fff; text-decoration: none; }
     3.9 +h2 { color: #444; } h3 { color: #666; font-size: 140%; }
    3.10 +a { text-decoration: underline; color: #215090; }
    3.11 +a:hover { text-decoration: none; }
    3.12 +pre {
    3.13 +	background-color: #f8f8f8;
    3.14 +	border: 1px solid #ddd;
    3.15 +	padding: 10px;
    3.16 +	overflow: auto;
    3.17 +	font-size: 96%;
    3.18 +}
    3.19 +
    3.20 +/* Header */
    3.21 +
    3.22 +#header {
    3.23 +	background: #351a0a;
    3.24 +	height: 40px;
    3.25 +	border-bottom: 8px solid #d66018;
    3.26 +}
    3.27 +
    3.28 +#header h1 {
    3.29 +	margin: 0;
    3.30 +	/* padding: 8px 0 0 42px; */
    3.31 +	width: 250px;
    3.32 +}
    3.33 +
    3.34 +#header h1 a { 
    3.35 +	color: white; 
    3.36 +	text-decoration: none;
    3.37 +	font-size: 20px;
    3.38 +	font-style: italic;
    3.39 +}
    3.40 +
    3.41 +#header h1 a:hover, #network a:hover { 
    3.42 +	color: #d66018;
    3.43 +}
    3.44 +
    3.45 +/* Header links */
    3.46 +
    3.47 +#network { 
    3.48 +	float: right; 
    3.49 +	padding: 10px 5px 0; 
    3.50 +	font-size: 12px;
    3.51 +}
    3.52 +
    3.53 +#network a {
    3.54 +	padding: 0 6px;
    3.55 +	color: #fff; 
    3.56 +	font-weight: bold;
    3.57 +	text-decoration: none;
    3.58 +}
    3.59 +
    3.60 +/* Content */
    3.61 +
    3.62 +#content {
    3.63 +	margin: 40px 80px;
    3.64 +	text-align: justify;
    3.65 +}
    3.66 +
    3.67 +.span-ok { color: green; }
    3.68 +.span-red { color: red; }
    3.69 +.span-sky { color: blue; }
    3.70 +.span-no { color: orange; }
    3.71 +.span-line { color: #888; }
    3.72 +.log-date { color: #666; font-size: 95%; }
    3.73 +.sh-comment { color: #b20000; }
    3.74 +.sh-val { color: #f35a00; }
    3.75 +
    3.76 +/* Buttons */
    3.77 +
    3.78 +.button {
    3.79 +	padding: 2px 4px;
    3.80 +	cursor: pointer;
    3.81 +	color: #000;
    3.82 +}
    3.83 +
    3.84 +a.button, .pctbar  {
    3.85 +	text-decoration: none;
    3.86 +	color: #666;
    3.87 +}
    3.88 +
    3.89 +.button:hover {
    3.90 +	background-color: #ddd;
    3.91 +	border: 1px solid #999;
    3.92 +}
    3.93 +
    3.94 +.pct { background: #9dff4a; padding: 2px 4px; }
    3.95 +
    3.96 +.button, .pctbar {
    3.97 +	margin: 0;
    3.98 +	background: #f1f1f1;
    3.99 +	border: 1px solid #ddd;
   3.100 +}
   3.101 +
   3.102 +/* Round corner */
   3.103 +
   3.104 +pre, .button, .pctbar {
   3.105 +	-moz-border-radius: 4px;
   3.106 +	-webkit-border-radius: 4px;
   3.107 +	border-radius: 4px;
   3.108 +}
   3.109 +
   3.110 +/* Footer */
   3.111 +
   3.112 +#footer {
   3.113 +	text-align: center;
   3.114 +	padding: 20px;
   3.115 +	border-top: 1px solid #ddd;
   3.116 +	font-size: 90%;
   3.117 +}
   3.118 +
   3.119 +#footer a { padding: 0 2px; }
     4.1 --- a/tank/tank	Tue Mar 13 22:59:06 2012 +0000
     4.2 +++ b/tank/tank	Wed Mar 14 03:12:37 2012 +0100
     4.3 @@ -16,18 +16,21 @@
     4.4  usage() {
     4.5  	echo -e "\nUsage: `basename $0` [command]
     4.6  Commands:
     4.7 -  stats|-s         Display some Tank stats
     4.8 -  backup|-b        Backup files and MySQL DB
     4.9 -  chroot|-c        Move a user into a new chroot location
    4.10 -  up-www|-uw       Update website http://www.slitaz.org/
    4.11 -  up-tank|-ut      Update http://tank.slitaz.org/
    4.12 -  up-people|-up    Update http://people.slitaz.org/
    4.13 -  up-pro           Update http://pro.slitaz.org/
    4.14 -  up-boot|-ub      Update http://boot.slitaz.org/
    4.15 -  up-hg|-uh        Update template for http://hg.slitaz.org/
    4.16 -  up-doc|-ud       Update template for http://doc.slitaz.org/
    4.17 -  up-stats|-us     Update Awstats statistics (run by cron)
    4.18 -  adduser|-au      Add user on tank\n"
    4.19 +  stats|-s     Display some Tank stats
    4.20 +  backup|-b    Backup files and MySQL DB
    4.21 +  adduser      Add user on Tank and create people files
    4.22 +  chroot|-c    Move a user into a new chroot location
    4.23 +  up-stats     Update Awstats statistics (run by cron)
    4.24 +  
    4.25 +  up-tank      Update http://tank.slitaz.org/
    4.26 +  up-people    Update http://people.slitaz.org/
    4.27 +  up-pro       Update http://pro.slitaz.org/
    4.28 +  up-boot      Update http://boot.slitaz.org/
    4.29 +  up-cook      Update http://cook.slitaz.org/
    4.30 +  
    4.31 +  #up-www       Update website http://www.slitaz.org/
    4.32 +  #up-hg        Update template for http://hg.slitaz.org/
    4.33 +  #up-doc       Update template for http://doc.slitaz.org/\n"
    4.34  }
    4.35  
    4.36  case "$1" in
    4.37 @@ -95,12 +98,12 @@
    4.38  	backup|-b)
    4.39  		# Backup config files and SQL db.
    4.40  		echo "TODO" ;;
    4.41 -	up-www|-uw)
    4.42 +	up-www)
    4.43  		# Update website from repo.
    4.44  		echo -e "\nUpdating: www.slitaz.org..."
    4.45  		cd $WEBSITE && hg pull -u
    4.46  		echo "" ;;
    4.47 -	up-tank|-ut)
    4.48 +	up-tank)
    4.49  		# Update Tank web interface: http://tank.slitaz.org/
    4.50  		echo -e "\nUpdating: tank.slitaz.org..."
    4.51  		cd $REPOS/slitaz-forge
    4.52 @@ -108,7 +111,7 @@
    4.53  		rm -rf $VHOST/*.* $VHOST/images
    4.54  		cp -a tank/web/* $VHOST 
    4.55  		echo "" ;;
    4.56 -	up-people|-up)
    4.57 +	up-people)
    4.58  		# Update People web interface: http://people.slitaz.org/
    4.59  		echo -e "\nUpdating: people.slitaz.org..."
    4.60  		cd $REPOS/slitaz-forge
    4.61 @@ -124,7 +127,7 @@
    4.62  		rm -rf $WWW/pro/*
    4.63  		cp -a pro/* $WWW/pro
    4.64  		echo "" ;;
    4.65 -	up-boot|-ub)
    4.66 +	up-boot)
    4.67  		# Update Web Boot interface: http://boot.slitaz.org/
    4.68  		echo -e "\nUpdating: boot.slitaz.org..."
    4.69  		cd $REPOS/slitaz-forge
    4.70 @@ -132,7 +135,15 @@
    4.71  		rm -rf $WWW/boot/*
    4.72  		cp -a boot/* $WWW/boot 
    4.73  		echo "" ;;
    4.74 -	up-hg|-uh)
    4.75 +	up-cook)
    4.76 +		# Update Web Boot interface: http://boot.slitaz.org/
    4.77 +		echo -e "\nUpdating: cook.slitaz.org..."
    4.78 +		cd $REPOS/slitaz-forge
    4.79 +		hg pull -u
    4.80 +		cp -a cook/* $WWW/cook
    4.81 +		cp -a cook/* $WWW/cook/undigest
    4.82 +		echo "" ;;
    4.83 +	up-hg)
    4.84  		# Since Tank runs stable and we update the style in slitaz-dev-tools
    4.85  		# the cooking package is unbuildable because it uses the new Tazwok function
    4.86  		# with mercurial|*
    4.87 @@ -141,20 +152,20 @@
    4.88  		cp -a slitaz-mercurial-style/* $PYTHON_LIB/site-packages/mercurial
    4.89  		chown -R root.root $PYTHON_LIB/site-packages/mercurial/templates
    4.90  		echo "" ;;
    4.91 -	up-doc|-ud)
    4.92 +	up-doc)
    4.93  		# Update Wiki doc template from Hg: http://doc.slitaz.org/
    4.94  		echo -e "\nUpdating Wiki documentation template..."
    4.95  		cd $REPOS/slitaz-forge && hg pull -u
    4.96  		cp -a doc/lib/tpl/* $DOC_LIB/tpl
    4.97  		echo "" ;;
    4.98 -	up-stats|-us)
    4.99 +	up-stats)
   4.100  		echo -e "\nUpdating all awstats databases..."
   4.101 -		for vh in www boot pkgs
   4.102 +		for vh in pro boot cook
   4.103  		do
   4.104  			/var/www/cgi-bin/awstats.pl -config=$vh.slitaz.org 
   4.105  		done
   4.106  		echo "" ;;
   4.107 -	adduser|-au)
   4.108 +	adduser)
   4.109  		# On Tank /etc/skel is empty to let tank handle default user
   4.110  		# files.
   4.111  		echo ""