slitaz-pizza rev 9
Edit pizza
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Mar 25 00:44:53 2012 +0000 (2012-03-25) |
| parents | 46e01beb351a |
| children | 717e991b3c18 |
| files | README data/README.distro pizza pizza-bot web/lib/functions.js web/pizza.cgi web/pkgs.cgi web/rootfs.cgi |
line diff
1.1 --- a/README Sat Mar 24 23:13:48 2012 +0100 1.2 +++ b/README Sun Mar 25 00:44:53 2012 +0000 1.3 @@ -2,29 +2,29 @@ 1.4 ================================================================================ 1.5 1.6 1.7 -The SliTaz Pizza provide tools and utils to build Live systems online. 1.8 +The SliTaz Pizza provides tools and utils to build Live systems online. 1.9 1.10 1.11 - * Build ISO flavor online in a simple to use and modern interface 1.12 - * Use stable packages or cooking if next to a stable release 1.13 - * Build queue and one build at time to be less resources intensiv 1.14 - * Can be run localy as a frontend to Tazlito or from the cmdline 1.15 + * Build ISO flavors online in a simple to use and modern interface 1.16 + * Use stable packages or cooking if near to a stable release 1.17 + * Build queue and one build at a time to be less resources intensive 1.18 + * Can be run locally as a frontend to Tazlito or from the cmdline 1.19 * Produce standard and valid HTML code and wildly themable 1.20 * Provide a status page to follow build process for each flavor 1.21 * Create a tarball of the flavor receipt, list and addfiles 1.22 * Log activities, build process and provide useful statistics 1.23 - * Keep ISO images and files public a while, then archive them 1.24 + * Keep ISO images and files public for a while, then archive them 1.25 * Uniq ID strings for each flavor and mail notification 1.26 - * RSS feed for all new builded flavors and summary on web interface 1.27 + * RSS feed for all newly built flavors and summary on web interface 1.28 1.29 1.30 Build process 1.31 ------------- 1.32 -First you have to choose the distro name, provide a short description, 1.33 -a valid email address so Pizza can notify you when ISO is built or in 1.34 +First you have to choose the distro name, provide a short description, and 1.35 +a valid email address so Pizza can notify you when ISOs are built or in 1.36 case the build failed. You must also choose a skeleton to base your 1.37 custom distro on. Then add some packages and follow the steps. When 1.38 -validate the build, Pizza will create a tarball of your flavors a add 1.39 +validating the build, Pizza will create a tarball of your flavors and add 1.40 it to the build queue, so it can take some time before your ISO image 1.41 is generated. 1.42 1.43 @@ -34,24 +34,24 @@ 1.44 1.45 * Is it long to build ? 1.46 1.47 - By default Pizza build a distro each 20 min but skip a run if an 1.48 - other distro is still building. After it depend on the build queue, 1.49 + By default Pizza builds a distro every 20 min but skips a run if 1.50 + another distro is still building. After it depends on the build queue, 1.51 and the size of your custom SliTaz distro. 1.52 1.53 * How long do you keep my ISO ? 1.54 1.55 - We can't garanty hosting for long time actually, we will keep your 1.56 - product as long as wee can. But surely enough time to share it with 1.57 + We can't guaranty hosting for a long time actually, we will keep your 1.58 + product as long as we can. But surely enough time to share it with 1.59 your friends or family. 1.60 1.61 1.62 1.63 Installation and Administration 1.64 ------------------------------- 1.65 -Pizza use a chroot to build ISO and a web interface to create the flavor 1.66 -file. Pizza can be installed and setup in a few commands. The package provide 1.67 -pizza host utility, pizza-bot build bot for chroot and pizza.cgi wich is 1.68 -the web interface main script. So let's go throught the installation: 1.69 +Pizza uses a chroot to build ISOs and a web interface to create the flavor 1.70 +file. Pizza can be installed and setup in a few commands. The package provides 1.71 +a pizza host utility, pizza-bot build bot for chroot and pizza.cgi which is 1.72 +the web interface main script. So let's go through the installation: 1.73 1.74 # tazpkg -gi slitaz-pizza 1.75 1.76 @@ -60,27 +60,27 @@ 1.77 # hg clone http://hg.slitaz.org/slitaz-pizza 1.78 # cd pizza && make install 1.79 1.80 -You can display a list of command an a short usage with the usage command. 1.81 +You can display a list of commands and a short usage with the usage command. 1.82 Create the chroot and build environment. You may want to have a look 1.83 -at Pizza configuration file before processing: 1.84 +at the Pizza configuration file before processing: 1.85 1.86 # pizza setup 1.87 1.88 -Now you ready to start the build bot to build queued flavors one by one. 1.89 +Now you are ready to start the build bot to build queued flavors one by one. 1.90 You can also chroot in the environment to build manually or test. 1.91 1.92 # pizza start 1.93 1.94 -In time they may be quiet a lot of ISO and temporary files. To clean up the 1.95 +In time there may be quite a lot of ISOs and temporary files. To clean up the 1.96 temporary files and old flavors files: 1.97 1.98 # pizza purge 1.99 1.100 -The cron task is run in the chroot and check if any flavor have been submited, 1.101 -by default it check all 20 minutes. The bot frenquency can be changed by 1.102 +The cron task is run in the chroot and checks if any flavors have been submitted, 1.103 +by default it checks every 20 minutes. The bot frequency can be changed by 1.104 editing root crontabs in the build chroot. 1.105 1.106 -To check build queue or chroot manually your can use: 1.107 +To check build queue or chroot manually you can use: 1.108 1.109 # pizza exec pizza-bot 1.110 # pizza chroot 1.111 @@ -88,9 +88,9 @@ 1.112 1.113 Developers and translators 1.114 -------------------------- 1.115 -SHell script as you could expected. Keep speed in mind and security. Always 1.116 -think to have a simple option and a advanced option, for example in rootfs 1.117 -modification let users add custom wallpaper easely and advanced users can 1.118 +SHell script as you would expect. Keep speed in mind and security. Always 1.119 +think to have a simple option and an advanced option, for example in rootfs 1.120 +modification let users add custom wallpaper easily and advanced users can 1.121 upload a full roootfs. 1.122 1.123 Pizza has been coded from the beginning with gettext support. Please forget
2.1 --- a/data/README.distro Sat Mar 24 23:13:48 2012 +0100 2.2 +++ b/data/README.distro Sun Mar 25 00:44:53 2012 +0000 2.3 @@ -8,9 +8,9 @@ 2.4 was created online by the SliTaz Pizza service. SliTaz GNU/Linux is distributed 2.5 in the hope that it will be useful, but with ABSOLUTELY NO WARRANTY. 2.6 2.7 -To boot SliTaz please insert de cdrom into your computer and boot or reboot to 2.8 -choose the cdrom as first boot media. SliTaz run entirely in RAM memory and 2.9 -dont touch anything on your machine. SliTaz can also be installed on a USB 2.10 +To boot SliTaz please insert the cdrom into your computer and boot or reboot to 2.11 +choose the cdrom as first boot media. SliTaz runs entirely in RAM memory and 2.12 +doesn't touch anything on your machine. SliTaz can also be installed on USB 2.13 media and booted from the web via PXE. 2.14 2.15 http://pizza.slitaz.me/
3.1 --- a/pizza Sat Mar 24 23:13:48 2012 +0100 3.2 +++ b/pizza Sun Mar 25 00:44:53 2012 +0000 3.3 @@ -1,6 +1,6 @@ 3.4 #!/bin/sh 3.5 # 3.6 -# SliTaz Pizza host cmdline utility - Create environment, chroot, clean 3.7 +# SliTaz Pizza host cmdline utility - Create environment, chroot, clean. 3.8 # Backup and purge should be done via cron jobs. 3.9 # 3.10 3.11 @@ -39,7 +39,7 @@ 3.12 get-lists Get latest skel packages list from Hg. 3.13 sync-pkgs Sync packages from SliTaz mirror. 3.14 purge Purge Pizza tmp directory. 3.15 - clean Complet chroot clean-up. 3.16 + clean Complete chroot clean-up. 3.17 3.18 EOT 3.19 } 3.20 @@ -84,7 +84,7 @@ 3.21 # Setup build host. 3.22 crontabs="$chroot/var/spool/cron/crontabs" 3.23 if [ -d "$chroot/proc" ]; then 3.24 - echo "Chroot already exist: $chroot" && exit 0 3.25 + echo "Chroot already exists: $chroot" && exit 0 3.26 fi 3.27 echo "" 3.28 echo "Setting up Pizza environment..." 3.29 @@ -105,7 +105,7 @@ 3.30 bot_config 3.31 # No more needed when slitaz-base-files have rc.functions 3.32 cp -f /etc/init.d/rc.functions $chroot/etc/init.d 3.33 - echo '# Check pizza queue each 5 min' > $crontabs/root 3.34 + echo '# Check pizza queue every 5 mins' > $crontabs/root 3.35 echo '*/20 * * * * /usr/bin/pizza-bot' >> $crontabs/root 3.36 status 3.37 3.38 @@ -131,7 +131,7 @@ 3.39 echo "To start Pizza Bot: $(basename $0) start" 3.40 echo "" ;; 3.41 up-files) 3.42 - # Update files in chroot when pizza is update on host. 3.43 + # Update files in chroot when pizza is updated on host. 3.44 echo -n "Updating chroot and virtual host..." 3.45 cp -a $DATA/web/* $VHOST 3.46 cp -a $DATA/pizza-bot $chroot/usr/bin
4.1 --- a/pizza-bot Sat Mar 24 23:13:48 2012 +0100 4.2 +++ b/pizza-bot Sun Mar 25 00:44:53 2012 +0000 4.3 @@ -1,8 +1,8 @@ 4.4 #!/bin/sh 4.5 # 4.6 # SliTaz Pizza chroot cmdline utility. This tool is designed to be run 4.7 -# by cron and automaticaly build flavors in the queue. We build one ISO 4.8 -# at once so we dont use too much resources. 4.9 +# by cron and automatically build flavors in the queue. We build one ISO 4.10 +# at once so we don't use too many resources. 4.11 # 4.12 # Copyright (C) 2012 SliTaz GNU/Linux - GNU gpl v2 4.13 # Authors : Christophe Lincoln <pankso@slitaz.org> 4.14 @@ -32,7 +32,7 @@ 4.15 exit 0 4.16 } 4.17 4.18 -# Create a XML feed for freshly builded flavor. 4.19 +# Create a XML feed for freshly built flavor. 4.20 gen_rss() { 4.21 pubdate=$(date "+%a, %d %b %Y %X") 4.22 cat > $feeds/slitaz-$ID.xml << EOT 4.23 @@ -60,20 +60,20 @@ 4.24 Hi, 4.25 4.26 Your custom SliTaz GNU/Linux system is ready to download! It will be 4.27 -hosted a as long as we can but with absolutely no warranty in time. 4.28 +hosted as long as we can but with absolutely no warranty in time. 4.29 4.30 Get $FLAVOR ISO and files at: ${PIZZA_URL}?id=slitaz-$ID 4.31 4.32 ISO size: $ISO_SIZE 4.33 MD5 sum: $md5 4.34 4.35 -If you wish a long time service hosting please get in touch via our 4.36 +If you wish a long time hosting service please get in touch via our 4.37 professional platform at http://slitaz.pro 4.38 4.39 Visit http://www.slitaz.org for latest news about the project and 4.40 get community support on SliTaz Forum http://forum.slitaz.org 4.41 4.42 -Sended by the SliTaz Pizza Mailer 4.43 +Sent by the SliTaz Pizza Mailer 4.44 4.45 EOT 4.46 } 4.47 @@ -112,7 +112,7 @@ 4.48 gen_rss 4.49 4.50 # We want a public packages list md5sum file and move ISO so users 4.51 - # can download it. Keep original pkgs list and build a complet one. 4.52 + # can download it. Keep original pkgs list and build a complete one. 4.53 cp -f $FLAVOR/packages.list $public/$name 4.54 cd $pizza/distro 4.55 pkgsinst="$public/$name/installed.list"
5.1 --- a/web/lib/functions.js Sat Mar 24 23:13:48 2012 +0100 5.2 +++ b/web/lib/functions.js Sun Mar 25 00:44:53 2012 +0000 5.3 @@ -11,7 +11,7 @@ 5.4 } 5.5 if(document.forms["pizza"]["desc"].value == "") 5.6 { 5.7 - alert("Please fill up the flavor description"); 5.8 + alert("Please fill in the flavor description"); 5.9 document.forms["pizza"]["desc"].focus(); 5.10 return false; 5.11 }
6.1 --- a/web/pizza.cgi Sat Mar 24 23:13:48 2012 +0100 6.2 +++ b/web/pizza.cgi Sun Mar 25 00:44:53 2012 +0000 6.3 @@ -1,6 +1,6 @@ 6.4 #!/bin/sh 6.5 # 6.6 -# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 6.7 +# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 6.8 # Please KISS, it is important and keep speed in mind. Thanks, Pankso. 6.9 # 6.10 6.11 @@ -66,9 +66,9 @@ 6.12 cat << EOT 6.13 <h2>$(gettext "First step")</h2> 6.14 <p> 6.15 - $(gettext "Chosse your distribution name and the one you want to use as 6.16 - base. We need our mail to notify you when your SliTaz Flavor is built 6.17 - and if any things goes wrong.") 6.18 + $(gettext "Choose your distribution name and the one you want to use as 6.19 + base. We need your mail to notify you when your SliTaz Flavor is built 6.20 + and if anything goes wrong.") 6.21 </p> 6.22 <form method="get" action="pkgs.cgi" name="pizza" onsubmit="return checkForm();"> 6.23 <table> 6.24 @@ -125,9 +125,9 @@ 6.25 <h2>$(gettext "Generate")</h2> 6.26 <p> 6.27 Last chance to stop process or start over. Next step will pack your 6.28 - flavor and add it to the build queue. Here you can also add note to 6.29 + flavor and add it to the build queue. Here you can also add a note to 6.30 your receipt flavor, this will be displayed on your flavor ID page 6.31 - and can be used to give more infos to other users and SliTaz developers. 6.32 + and can be used to give more info to other users and SliTaz developers. 6.33 </p> 6.34 <pre> 6.35 Uniq ID : $id 6.36 @@ -208,7 +208,7 @@ 6.37 if [ "$inqueue" == "1" ]; then 6.38 gettext "Your ISO will be built on next Pizza Bot run" 6.39 else 6.40 - eval_gettext "Ther is \$inqueue flavors in queue" 6.41 + eval_gettext "There is \$inqueue flavors in queue" 6.42 fi 6.43 echo "" 6.44 echo "New flavor added to queue: <a href='?id=$id'>$id</a>" | log 6.45 @@ -237,7 +237,7 @@ 6.46 [ -f "public/slitaz-$id/receipt" ] && . public/slitaz-$id/receipt 6.47 log="$public/slitaz-$id/distro.log" 6.48 if [ ! -d "public/slitaz-$id" ]; then 6.49 - echo "Sorry, can't found flavor ID: $id" 6.50 + echo "Sorry, can't find flavor ID: $id" 6.51 cat lib/footer.html && exit 0 6.52 fi 6.53 if [ -f "$public/slitaz-$id/$FLAVOR.iso" ]; then 6.54 @@ -326,8 +326,8 @@ 6.55 cat << EOT 6.56 <h2>$(gettext "Welcome")</h2> 6.57 <p> 6.58 - SliTaz Pizza let you create your own SliTaz ISO flavor online. The 6.59 - ISO image can be burnt on a cdrom or installed on an USB media. 6.60 + SliTaz Pizza lets you create your own SliTaz ISO flavor online. The 6.61 + ISO image can be burnt on a cdrom or installed on USB media. 6.62 Please read the SliTaz Pizza 6.63 <a href="?help">Help</a> before starting a new flavor. 6.64 </p>
7.1 --- a/web/pkgs.cgi Sat Mar 24 23:13:48 2012 +0100 7.2 +++ b/web/pkgs.cgi Sun Mar 25 00:44:53 2012 +0000 7.3 @@ -1,6 +1,6 @@ 7.4 #!/bin/sh 7.5 # 7.6 -# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 7.7 +# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 7.8 # Packages step 7.9 # 7.10 7.11 @@ -20,7 +20,7 @@ 7.12 # 7.13 7.14 list_pkgs() { 7.15 - # Pizza use local packages synced with mirror each night. 7.16 + # Pizza uses local packages synced with mirror each night. 7.17 pkgsdesc="$SLITAZ/$SLITAZ_VERSION/packages/packages.desc" 7.18 [ ! -f "$pkgsdesc" ] && echo "Missing: $pkgsdesc" 7.19 for pkg in $(cat $list)
8.1 --- a/web/rootfs.cgi Sat Mar 24 23:13:48 2012 +0100 8.2 +++ b/web/rootfs.cgi Sun Mar 25 00:44:53 2012 +0000 8.3 @@ -1,6 +1,6 @@ 8.4 #!/bin/sh 8.5 # 8.6 -# SliTaz Pizza CGI/web interface - Let's me have a pizza :-) 8.7 +# SliTaz Pizza CGI/web interface - Let's have a pizza :-) 8.8 # SliTaz rootfs step 8.9 # 8.10 8.11 @@ -24,7 +24,7 @@ 8.12 chmod a+r $upload/$tarball 8.13 status 8.14 8.15 - # Ectract into the tmp upload dir. 8.16 + # Extract into the tmp upload dir. 8.17 gettext "Extracting archive for sanity checks..." 8.18 case "$tarball" in 8.19 *.tar.gz) tar xzf $tarball && status ;; 8.20 @@ -58,7 +58,7 @@ 8.21 8.22 # So now it time to move the addfile to flavor files. 8.23 if [ -d "$upload/rootfs" ]; then 8.24 - echo "Additionnal rootfs: accepted" | tee -a $log 8.25 + echo "Additional rootfs: accepted" | tee -a $log 8.26 mkdir -p $tmpdir/slitaz-$id 8.27 mv $upload/rootfs $tmpdir/slitaz-$id 8.28 rm -rf $tmpdir/slitaz-$id/upload-* 8.29 @@ -96,7 +96,7 @@ 8.30 esac 8.31 8.32 # 8.33 -# Source receipt and display page with additonal rootfs or file upload. 8.34 +# Source receipt and display page with additional rootfs or file upload. 8.35 # 8.36 . $tmpdir/slitaz-$id/receipt 8.37 cat << EOT 8.38 @@ -105,7 +105,7 @@ 8.39 8.40 <p> 8.41 SliTaz root filesystem modification can be done via an easy to use form, 8.42 - a single tarball or by uploading file one by one in the wanted directory. 8.43 + a single tarball or by uploading files one by one in the wanted directory. 8.44 </p> 8.45 8.46 <h3>$(gettext "Easy customization")</h3> 8.47 @@ -117,9 +117,9 @@ 8.48 <h3>$(gettext "Rootfs tarball")</h3> 8.49 <p> 8.50 The files in the rootfs archive must have the same directory structure 8.51 - than any standard SliTaz or Linux system. For example if you wish to 8.52 + as any standard SliTaz or Linux system. For example if you wish to 8.53 have a custom boot configuration file, you will have: rootfs/etc/rcS.conf. 8.54 - Accepted tarball format are: <strong>tar.gz tar.bz2 tar.lzma</strong> 8.55 + Accepted tarball formats are: <strong>tar.gz tar.bz2 tar.lzma</strong> 8.56 and the archived directory must be named rootfs with a valid file system 8.57 hierachy such as: /usr/bin /etc /var/www 8.58 </p>