X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fwww_shellcommands.pm;h=0e50d607c4d411f23784d13b592f73c6a31fcbb1;hb=f7fd2a3e34da751cbc02bbf215e99c6dc89adc15;hp=e90120ec9694125faf7abfb115cf33327fb8f544;hpb=6464c76c549ba420f98e67aaca1c26327a8a2671;p=freeside.git diff --git a/FS/FS/part_export/www_shellcommands.pm b/FS/FS/part_export/www_shellcommands.pm index e90120ec9..0e50d607c 100644 --- a/FS/FS/part_export/www_shellcommands.pm +++ b/FS/FS/part_export/www_shellcommands.pm @@ -10,19 +10,19 @@ use 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', + default=>'mkdir $homedir/$zone; chown $username $homedir/$zone; ln -s $homedir/$zone /var/www/$zone', }, 'userdel' => { label=>'Delete command', - default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm $homedir/$zone', + default=>'[ -n "$zone" ] && rm -rf /var/www/$zone; rm -rf $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', + 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', }, ; %info = ( 'svc' => 'svc_www', - 'desc' => 'Run remote commands via SSH, for virtual web sites.', + 'desc' => 'Run remote commands via SSH, for virtual web sites (directory maintenance, FrontPage, ISPMan)', 'options' => \%options, 'notes' => <<'END' Run remote commands via SSH, for virtual web sites. You will need to @@ -32,22 +32,29 @@ Run remote commands via SSH, for virtual web sites. You will need to
new_
or old_
for replace operations):
$zone
- fully-qualified zone of this virtual host
+ $bare_zone
- just the zone of this virtual host, without the domain portion
$domain
- base domain
$username
$homedir
@@ -83,8 +90,10 @@ 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 $_password = $svc_acct->_password;
my $homedir = $svc_acct->dir; # or die ?
#done setting variables for the command
@@ -108,24 +117,20 @@ 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 ?
+ my $old_zone = $old_domain_record->zone; # or die ?
my $old_domain = $old_domain_record->svc_domain->domain;
- $old_zone .= ".$old_domain" unless $old_zone =~ /\.$/;
-
+ ( 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 ?
+ my $new_zone = $new_domain_record->zone; # or die ?
my $new_domain = $new_domain_record->svc_domain->domain;
- unless ( $new_zone =~ /\.$/ ) {
- my $new_svc_domain = $new_domain_record->svc_domain; # or die ?
- $new_zone .= '.'. $new_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__password = $new_svc_acct->_password;
my $new_homedir = $new_svc_acct->dir; # or die ?
#done setting variables for the command