Changeset 1117

Timestamp:

11/26/10 12:54:45 (2 years ago)

Author:

bruno

Message:

r4058@localhost: bruno | 2010-11-26 11:42:34 +0100

• New Web site management with 4 targtes instead of only 2 (sbx2webssh, ...)

Location:

devel

Files:

• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (8 diffs)

devel/pb-modules/etc/pb.conf.pod

@@ -580 +580 @@
  Example: webdir mondorescue = website
 
-=item B<pb URL>
-=item B<pb directory desc>
-=item B<pb environment variables>
-
 =back
+
+=head1 OTHER PARAMETERS
+=item B<pb_URL>
+=item B<pb_directory_desc>
+=item B<pb_environment_variables>

devel/pb/bin/pb

@@ -292 +292 @@
 Announce the availability of the project through various means
 
-=item B<web2ssh>
-
-Deliver the Web site content to the target server using ssh.
+=item B<sbx2webssh>
+
+Create tar files for the website under your CMS. 
+Current state of the exported content is taken.
+Deliver the content to the target server using ssh from the exported dir.
+
+=item B<cms2webssh>
+
+Create tar files for the website from your CMS. 
+Deliver the content to the target server using ssh from the DVCS.
+
+=item B<sbx2webpkg>
+
+Create tar files for the website under your CMS. 
+Current state of the exported content is taken.
+
+=item B<cms2webpkg>
+
+Create tar files for the website under your CMS. 
 
 =item B<clean>
@@ -563 +579 @@
 
     pb_announce();
-} elsif ($action =~ /^web2ssh$/) {
+} elsif ($action =~ /^sbx2webpkg$/) {
     require DBI;
     require DBD::SQLite;
 
-    pb_cms2build("Web");
+    pb_cms2build("SandBox","Web");
+} elsif ($action =~ /^sbx2webssh$/) {
+    require DBI;
+    require DBD::SQLite;
+
+    pb_cms2build("SandBox","Web");
+    pb_send2target("Web");
+} elsif ($action =~ /^cms2webpkg$/) {
+    require DBI;
+    require DBD::SQLite;
+
+    pb_cms2build("CMS","Web");
+} elsif ($action =~ /^cms2webssh$/) {
+    require DBI;
+    require DBD::SQLite;
+
+    pb_cms2build("CMS","Web");
     pb_send2target("Web");
 } else {
@@ -577 +609 @@
 
     my $param = shift || undef;
+    my $web = shift || undef;
 
     my $pkg;
@@ -585 +618 @@
     my %pb;             # Structure to store conf info
 
-    die "pb_cms2build requires a parameter: Web, SandBox or CMS" if (not defined $param);
+    die "pb_cms2build requires a parameter: SandBox or CMS" if (not defined $param);
 
     # If Website, then pkg is only the website
-    if ($param eq "Web") {
+    if (defined $web) {
         ($webdir) = pb_conf_get("webdir");
         pb_log(2,"webdir: ".Dumper($webdir)."\n");
@@ -645 +678 @@
         my $dir = $defpkgdir->{$pbpkg};
         $dir = $extpkgdir->{$pbpkg} if (not defined $dir);
-        $dir = $webdir->{$ENV{'PBPROJ'}} if ($param eq "Web");
+        $dir = $webdir->{$ENV{'PBPROJ'}} if (defined $web);
+        die "Variable \$dir not defined. Please report to dev team with log of a verbose run and this info ".Dumper($webdir) if (not defined $dir);
         pb_log(2,"def:".Dumper($defpkgdir)." ext: ".Dumper($extpkgdir)." \n");
 
@@ -703 +737 @@
         $pb{'ver'} = $pbver;
         $pb{'pkg'} = $pbpkg;
+        $pb{'realpkg'} = $pbpkg;
         $pb{'date'} = $pbdate;
         $pb{'defpkgdir'} = $defpkgdir;
@@ -714 +749 @@
     
         # Do not do that for website
-        if ($param ne "Web") {
+        if (not defined $web) {
             pb_log(0,"Build files are being generated for ...\n");
             my %virt;
@@ -837 +872 @@
 
         # Do not do that for website
-        if ($param ne "Web") {
+        if (not defined $web) {
             my %tmp;
             my $warnflag = 0;