Changeset 560 in ProjectBuilder

Timestamp:

Sep 29, 2008, 2:00:01 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds script for website installation on remote site
• Use apache account for mondo's delivery
• Update announces to fix html errors
• web2ssh is now working (tested fully with mondo)

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• projects/mondorescue/pbconf/announces3.sql (modified) ( previous)
• projects/mondorescue/pbconf/branches/2.2.6/mondorescue.pb (modified) (2 diffs)
• projects/mondorescue/pbconf/branches/2.2.7/mondorescue.pb (modified) (1 diff)

devel/pb/bin/pb

@@ -720 +720 @@
             # And create an empty pbconf
             pb_mkdir_p("$dest/pbconf");
+            # And prepare the pbscript to execute remotely
+            open(SCRIPT,"> $ENV{'PBDESTDIR'}/pbscript") || die "Unable to create $ENV{'PBDESTDIR'}/pbscript";
+            print SCRIPT "#!/bin/bash\n";
+            print SCRIPT "#set -x\n";
+            print SCRIPT "echo ... Extracting Website content\n";
+            print SCRIPT "find . -type f | grep -Ev '^./$pbpkg-$pbver.tar.gz|^./pbscript' | xargs rm -f non-existent\n";
+            print SCRIPT "find * -type d -depth | xargs rmdir 2> /dev/null \n";
+            print SCRIPT "tar xfz $pbpkg-$pbver.tar.gz\n";
+            print SCRIPT "mv $pbpkg-$pbver/* .\n";
+            print SCRIPT "rm -f $pbpkg-$pbver.tar.gz\n";
+            print SCRIPT "rmdir $pbpkg-$pbver\n";
+            close(SCRIPT);
         }
 
@@ -1034 +1046 @@
                     $cmd = "$cmd ; ln -sf $pbpkg-$pbver.tar.gz $pbpkg-latest.tar.gz";
                 }
+            } elsif ($cmt eq "Web") {
+                $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz"
             }
         }
@@ -1042 +1056 @@
     if (($cmt eq "vm") || ($cmt eq "ve")) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript";
-    } elsif ($cmt eq "Script") {
+    } elsif (($cmt eq "Script") || ($cmt eq "Web")) {
         $src="$src $ENV{'PBDESTDIR'}/pbscript";
-    } elsif (($cmt eq "Announce") || ($cmt eq "Web")) {
+    } elsif ($cmt eq "Announce") {
         $src="$src $ENV{'PBTMP'}/pbscript";
     } elsif ($cmt eq "Packages") {

projects/mondorescue/pbconf/branches/2.2.6/mondorescue.pb

@@ -47 +47 @@
 extpkgdir mondo-rescue = mondo
 
+# Website management and delivery
+webdir mondorescue = website
+websshhost mondorescue = www.mondorescue.org
+websshlogin mondorescue = apache
+websshdir mondorescue = /mondo/www/html/mondo
+websshport mondorescue = 22
+
 # Hash of valid version names
 version mondorescue = devel,stable
@@ -56 +63 @@
 filteredfiles mindi = rootfs/sbin/init,mindi,install.sh
 filteredfiles mindi-busybox = Makefile
-filteredfiles mondo-website = top.shtml
+filteredfiles website = top.shtml

projects/mondorescue/pbconf/branches/2.2.7/mondorescue.pb

@@ -50 +50 @@
 webdir mondorescue = website
 websshhost mondorescue = www.mondorescue.org
-websshlogin mondorescue = bruno
+websshlogin mondorescue = apache
 websshdir mondorescue = /mondo/www/html/mondo
 websshport mondorescue = 22