X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fwww_shellcommands.pm;h=bef2e9470d99a9bda8fe9467644fa7a675c7d941;hp=0e50d607c4d411f23784d13b592f73c6a31fcbb1;hb=1ad547a47f16b4230762e752fbe48d460ed997e1;hpb=b8cfd0780aa40bb07f3215bf9cb58011f5e32a35

diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm
index 0e50d607c..bef2e9470 100644
--- a/FS/FS/part_export/www_shellcommands.pm
+++ b/FS/FS/part_export/www_shellcommands.pm
@@ -18,6 +18,12 @@ tie my %options, 'Tie::IxHash',
   'usermod'  => { label=>'Modify command',
                   default=>'[ -n "$old_zone" ] && rm /var/www/$old_zone; [ "$old_zone" != "$new_zone" -a -n "$new_zone" ] && ( mv $old_homedir/$old_zone $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone ); [ "$old_username" != "$new_username" ] && chown -R $new_username $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone',
                 },
+  'suspend'  => { label=>'Suspension command',
+                  default=>'[ -n "$zone" ] && chmod 0 /var/www/$zone',
+                },
+  'unsuspend'=> { label=>'Unsuspension command',
+                  default=>'[ -n "$zone" ] && chmod 755 /var/www/$zone',
+                },
 ;
 
 %info = (
@@ -26,7 +32,7 @@ tie my %options, 'Tie::IxHash',
   '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>.
+<a href="http://www.freeside.biz/mediawiki/index.php/Freeside:1.9:Documentation:Administration:SSH_Keys">setup SSH for unattended operation</a>.
 <BR><BR>Use these buttons for some useful presets:
 <UL>
   <LI>
@@ -35,6 +41,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
       this.form.useradd.value = "mkdir $homedir/$zone; chown $username $homedir/$zone; ln -s $homedir/$zone /var/www/$zone";
       this.form.userdel.value = "[ -n \"$zone\" ] && rm -rf /var/www/$zone; rm -rf $homedir/$zone";
       this.form.usermod.value = "[ -n \"$old_zone\" ] && rm /var/www/$old_zone; [ \"$old_zone\" != \"$new_zone\" -a -n \"$new_zone\" ] && ( mv $old_homedir/$old_zone $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone ); [ \"$old_username\" != \"$new_username\" ] && chown -R $new_username $new_homedir/$new_zone; ln -sf $new_homedir/$new_zone /var/www/$new_zone";
+      this.form.suspend.value = "[ -n \"$zone\" ] && chmod 0 /var/www/$zone";
+      this.form.unsuspend.value = "[ -n \"$zone\" ] && chmod 755 /var/www/$zone";
     '>
   <LI>
     <INPUT TYPE="button" VALUE="FrontPage extensions" onClick='
@@ -42,6 +50,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
       this.form.useradd.value = "/usr/local/frontpage/version5.0/bin/owsadm.exe -o install -p 80 -m $zone -xu $username -xg www-data -s /etc/apache/httpd.conf -u $username -pw $_password";
       this.form.userdel.value = "/usr/local/frontpage/version5.0/bin/owsadm.exe -o uninstall -p 80 -m $zone -s /etc/apache/httpd.conf";
       this.form.usermod.value = "";
+      this.form.suspend.value = "";
+      this.form.unsuspend.value = "";
     '>
   <LI>
     <INPUT TYPE="button" VALUE="ISPMan CLI" onClick='
@@ -49,6 +59,8 @@ Run remote commands via SSH, for virtual web sites.  You will need to
       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 = "";
+      this.form.suspend.value = "";
+      this.form.unsuspend.value = "";
     '></UL>
 The following variables are available for interpolation (prefixed with
 <code>new_</code> or <code>old_</code> for replace operations):
@@ -57,6 +69,7 @@ The following variables are available for interpolation (prefixed with
   <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>$_password</code>
   <LI><code>$homedir</code>
   <LI>All other fields in <a href="../docs/schema.html#svc_www">svc_www</a>
     are also available.
@@ -77,9 +90,20 @@ sub _export_delete {
   $self->_export_command('userdel', @_);
 }
 
+sub _export_suspend {
+  my($self) = shift;
+  $self->_export_command('suspend', @_);
+}
+
+sub _export_unsuspend {
+  my($self) = shift;
+  $self->_export_command('unsuspend', @_);
+}
+
 sub _export_command {
   my ( $self, $action, $svc_www) = (shift, shift, shift);
   my $command = $self->option($action);
+  return '' if $command =~ /^\s*$/;
 
   #set variable for the command
   no strict 'vars';
@@ -153,14 +177,15 @@ sub shellcommands_queue {
 }
 
 sub ssh_cmd { #subroutine, not method
-  use Net::SSH '0.08';
-  &Net::SSH::ssh_cmd( { @_ } );
+  use Net::OpenSSH;
+  my $opt = { @_ };
+  my $ssh = Net::OpenSSH->new($opt->{'user'}.'@'.$opt->{'host'});
+  die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
+  my ($output, $errput) = $ssh->capture2($opt->{'command'});
+  die "Error running SSH command: ". $ssh->error if $ssh->error;
+  die $errput if $errput;
+  die $output if $output;
+  '';
 }
 
-#sub shellcommands_insert { #subroutine, not method
-#}
-#sub shellcommands_replace { #subroutine, not method
-#}
-#sub shellcommands_delete { #subroutine, not method
-#}
-
+1;