Commit 0927ec6f authored by Jondy Zhao's avatar Jondy Zhao

change client certificate/key name to client.crt, client.key

parent 0c49ae23
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
<para>It used to generate all the configure files required by slapos slave node, you can run it anytime when you need change the configure of your slapos slave node.</para> <para>It used to generate all the configure files required by slapos slave node, you can run it anytime when you need change the configure of your slapos slave node.</para>
<para>Go to slapos.org (or any other SlapOS Master), register if not already done, go to My Account and request an SSL certificate: <para>Go to slapos.org (or any other SlapOS Master), register if not already done, go to My Account and request an SSL certificate:
<itemizedlist> <itemizedlist>
<listitem><para>Copy the certificate in a file, save it in C:/slapos/cygwin/certificate</para></listitem> <listitem><para>Copy the certificate in a file, save it in C:/slapos/cygwin/client.crt</para></listitem>
<listitem><para>Copy the key in a file, save it in C:/slapos/cygwin/key</para></listitem> <listitem><para>Copy the key in a file, save it in C:/slapos/cygwin/client.key</para></listitem>
</itemizedlist> </itemizedlist>
You can save them anywhere, but it's better to save them in the path C:/slapos/cygwin which is your slapos installed, because it's the default path in the slapos configure script. </para> You can save them anywhere, but it's better to save them in the path C:/slapos/cygwin which is your slapos installed, because it's the default path in the slapos configure script. </para>
<para>More information refer to <ulink url="http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Installing.SlapOS.Client"></ulink></para> <para>More information refer to <ulink url="http://community.slapos.org/wiki/osoe-Lecture.SlapOS.Extended/developer-Installing.SlapOS.Client"></ulink></para>
......
...@@ -335,11 +335,11 @@ function configure_section_client() ...@@ -335,11 +335,11 @@ function configure_section_client()
netdrive_reporter http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/netdrive-reporter/software.cfg netdrive_reporter http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/heads/cygwin-share:/software/netdrive-reporter/software.cfg
" >> ${client_template_file} " >> ${client_template_file}
get_configure_filename ${client_certificate_file} "/certificate" ${_client_certificate} get_configure_filename ${client_certificate_file} "/client.crt" ${_client_certificate}
openssl x509 -noout -in ${client_certificate_file} || \ openssl x509 -noout -in ${client_certificate_file} || \
csih_error "Invalid client certificate: ${client_certificate_file}." csih_error "Invalid client certificate: ${client_certificate_file}."
get_configure_filename ${client_key_file} "/key" ${_client_key} get_configure_filename ${client_key_file} "/client.key" ${_client_key}
openssl rsa -noout -in ${client_key_file} -check || \ openssl rsa -noout -in ${client_key_file} -check || \
csih_error "Invalid client key: ${client_key_file}." csih_error "Invalid client key: ${client_key_file}."
......
...@@ -24,8 +24,8 @@ declare -r slapos_prefix= ...@@ -24,8 +24,8 @@ declare -r slapos_prefix=
declare -r slapos_client_home=~/.slapos declare -r slapos_client_home=~/.slapos
declare -r client_configure_file=$slapos_client_home/slapos.cfg declare -r client_configure_file=$slapos_client_home/slapos.cfg
declare -r client_certificate_file=$slapos_client_home/certificate declare -r client_certificate_file=$slapos_client_home/client.crt
declare -r client_key_file=$slapos_client_home/key declare -r client_key_file=$slapos_client_home/client.key
declare -r client_template_file=/etc/slapos/slapos-client.cfg.example declare -r client_template_file=/etc/slapos/slapos-client.cfg.example
declare -r client_template_file_url=http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example declare -r client_template_file_url=http://git.erp5.org/gitweb/slapos.core.git/blob_plain/HEAD:/slapos-client.cfg.example
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment