summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rwxr-xr-xhttemplate/docs/passwd.html4
-rw-r--r--httemplate/edit/part_export.cgi4
2 files changed, 5 insertions, 3 deletions
diff --git a/httemplate/docs/passwd.html b/httemplate/docs/passwd.html
index 481e01896..fc1dde956 100755
--- a/httemplate/docs/passwd.html
+++ b/httemplate/docs/passwd.html
@@ -10,9 +10,9 @@ You may use fs_passwd/fs_passwd as a "passwd", "chfn" and "chsh" replacement on
<li>Setup SSH keys:
<ul>
<li>As the freeside user (on your freeside machine), generate an authentication key using <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>. Since this is for unattended operation, use a blank passphrase.
- <li>Append the newly-created <code>identity.pub</code> file to <code>~root
+ <li>Append the newly-created <code>identity.pub</code> file to <code>~freeside
/.ssh/authorized_keys</code> on the shell or web machine(s).
- <li>Some new SSH v2 implementation accept v2 style keys only. Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~root/.ssh/authorized_keys2</code> on the remote machine(s).
+ <li>Some new SSH v2 implementation accept v2 style keys only. Use the <code>-t</code> option to <a href="http://www.tac.eu.org/cgi-bin/man-cgi?ssh-keygen+1">ssh-keygen</a>, and append the created <code>id_dsa.pub</code> or <code>id_rsa.pub</code> to <code>~freeside/.ssh/authorized_keys2</code> on the remote machine(s).
</ul>
<li>Copy fs_passwd/fs_passwdd to /usr/local/sbin on the shell or web machine(s). (chown freeside, chmod 500)
<li>Create /usr/local/freeside on the shell or web machine(s). (chown freeside, chmod 700)
diff --git a/httemplate/edit/part_export.cgi b/httemplate/edit/part_export.cgi
index b72b277c9..4affeb48f 100644
--- a/httemplate/edit/part_export.cgi
+++ b/httemplate/edit/part_export.cgi
@@ -48,7 +48,9 @@ my $widget = new HTML::Widgets::SelectLayers(
# foreach my $option ( qw(url login password groupID ) ) {
my $optinfo = $exports->{$layer}{options}{$option};
my $label = $optinfo->{label};
- my $value = $cgi->param($option) || $part_export->option($option);
+ my $value = $cgi->param($option)
+ || $part_export->option($option)
+ || (exists $optinfo->{default} ? $optinfo->{default} : '');
$html .= qq!<TR><TD ALIGN="right">$label</TD>!.
qq!<TD><INPUT TYPE="text" NAME="$option" VALUE="$value"></TD>!.
'</TR>';