X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fwww_shellcommands.pm;h=6847f64709d429446706b08d71949ab556cd64e1;hp=20658c7a2aa13eba485d367e36cf206a1329f11c;hb=1dcea2453d573341d3153fb966b19be161c4f1ba;hpb=48f60f666bab22a3ca5196cf6cd573b8691e4aae

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 20658c7a2..6847f6470 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -1,11 +1,64 @@
 package FS::part_export::www_shellcommands;
 
 use strict;
-use vars qw(@ISA);
+use vars qw(@ISA %info);
+use Tie::IxHash;
 use FS::part_export;
 
 @ISA = qw(FS::part_export);
 
+tie my %options, 'Tie::IxHash',
+  'user' => { label=>'Remote username', default=>'root' },
+  'useradd' => { label=>'Insert command',
+                 default=>'mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone',
+               },
+  'userdel'  => { label=>'Delete command',
+                  default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone',
+                },
+  'usermod'  => { label=>'Modify command',
+                  default=>'[ -n "$old_zone" ] && rm $old_homedir/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && mv /var/www/$old_zone /var/www/$new_zone; [ "$old_username" != "$new_username" ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone',
+                },
+;
+
+%info = (
+  'svc'     => 'svc_www',
+  'desc'    => 'Run remote commands via SSH, for virtual web sites.',
+  'options' => \%options,
+  'notes'   => <<'END'
+Run remote commands via SSH, for virtual web sites.  You will need to
+<a href="../docs/ssh.html">setup SSH for unattended operation</a>.
+<BR><BR>Use these buttons for some useful presets:
+<UL>
+  <LI>
+    <INPUT TYPE="button" VALUE="Maintain directories" onClick='
+      this.form.user.value = "root";
+      this.form.useradd.value = "mkdir /var/www/$zone; chown $username /var/www/$zone; ln -s /var/www/$zone $homedir/$zone";
+      this.form.userdel.value = "[ -n &quot;$zone&quot; ] && rm -rf /var/www/$zone; rm $homedir/$zone";
+      this.form.usermod.value = "[ -n &quot;$old_zone&quot; ] && rm $old_homedir/$old_zone; [ &quot;$old_zone&quot; != &quot;$new_zone&quot; -a -n &quot;$new_zone&quot; ] && mv /var/www/$old_zone /var/www/$new_zone; [ &quot;$old_username&quot; != &quot;$new_username&quot; ] && chown -R $new_username /var/www/$new_zone; ln -s /var/www/$new_zone $new_homedir/$new_zone";
+    '>
+  <LI>
+    <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
+      this.form.user.value = "root";
+      this.form.useradd.value = "/usr/local/ispman/bin/ispman.addvhost -d $domain $bare_zone";
+      this.form.userdel.value = "/usr/local/ispman/bin/ispman.deletevhost -d $domain $bare_zone";
+      this.form.usermod.value = "";
+    '>
+</UL>
+The following variables are available for interpolation (prefixed with
+<code>new_</code> or <code>old_</code> for replace operations):
+<UL>
+  <LI><code>$zone</code> - fully-qualified zone of this virtual host
+  <LI><code>$bare_zone</code> - just the zone of this virtual host, without the domain portion
+  <LI><code>$domain</code> - base domain
+  <LI><code>$username</code>
+  <LI><code>$homedir</code>
+  <LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a>
+    are also available.
+</UL>
+END
+);
+
+
 sub rebless { shift; }
 
 sub _export_insert {
@@ -30,6 +83,8 @@ sub _export_command {
   }
   my $domain_record = $svc_www->domain_record; # or die ?
   my $zone = $domain_record->zone; # or die ?
+  my $domain = $domain_record->svc_domain->domain;
+  ( my $bare_zone = $zone ) =~ s/\.$domain$//;
   my $svc_acct = $svc_www->svc_acct; # or die ?
   my $username = $svc_acct->username;
   my $homedir = $svc_acct->dir; # or die ?
@@ -55,23 +110,17 @@ sub _export_replace {
     ${"new_$_"} = $new->getfield($_) foreach $new->fields;
   }
   my $old_domain_record = $old->domain_record; # or die ?
-  my $old_zone = $old_domain_record->reczone; # or die ?
-  unless ( $old_zone =~ /\.$/ ) {
-    my $old_svc_domain = $old_domain_record->svc_domain; # or die ?
-    $old_zone .= '.'. $old_svc_domain->domain;
-  }
-
+  my $old_zone = $old_domain_record->zone; # or die ?
+  my $old_domain = $old_domain_record->svc_domain->domain;
+  ( my $old_bare_zone = $old_zone ) =~ s/\.$old_domain$//;
   my $old_svc_acct = $old->svc_acct; # or die ?
   my $old_username = $old_svc_acct->username;
   my $old_homedir = $old_svc_acct->dir; # or die ?
 
   my $new_domain_record = $new->domain_record; # or die ?
-  my $new_zone = $new_domain_record->reczone; # or die ?
-  unless ( $new_zone =~ /\.$/ ) {
-    my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
-    $new_zone .= '.'. $new_svc_domain->domain;
-  }
-
+  my $new_zone = $new_domain_record->zone; # or die ?
+  my $new_domain = $new_domain_record->svc_domain->domain;
+  ( my $new_bare_zone = $new_zone ) =~ s/\.$new_domain$//;
   my $new_svc_acct = $new->svc_acct; # or die ?
   my $new_username = $new_svc_acct->username;
   my $new_homedir = $new_svc_acct->dir; # or die ?
@@ -96,7 +145,7 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.07';
+  use Net::SSH '0.08';
   &Net::SSH::ssh_cmd( { @_ } );
 }