Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
ff3bce32
Commit
ff3bce32
authored
Apr 24, 2016
by
neil
Browse files
minor, remove 'cp -p', for unnecessary warning message for Proxmox.
parent
4fa08fc7
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
ff3bce32
...
@@ -896,7 +896,7 @@ _restoreApache() {
...
@@ -896,7 +896,7 @@ _restoreApache() {
return
0
return
0
fi
fi
c
p
-p
"
$APACHE_CONF_BACKUP_DIR
/
$httpdconfname
"
"
$httpdconf
"
c
at
"
$APACHE_CONF_BACKUP_DIR
/
$httpdconfname
"
>
"
$httpdconf
"
_debug
"Restored:
$httpdconf
."
_debug
"Restored:
$httpdconf
."
if
!
apachectl
-t
;
then
if
!
apachectl
-t
;
then
_err
"Sorry, restore apache config error, please contact me."
_err
"Sorry, restore apache config error, please contact me."
...
@@ -915,7 +915,7 @@ _setApache() {
...
@@ -915,7 +915,7 @@ _setApache() {
#backup the conf
#backup the conf
_debug
"Backup apache config file"
$httpdconf
_debug
"Backup apache config file"
$httpdconf
cp
-p
$httpdconf
$APACHE_CONF_BACKUP_DIR
/
cp
$httpdconf
$APACHE_CONF_BACKUP_DIR
/
_info
"JFYI, Config file
$httpdconf
is backuped to
$APACHE_CONF_BACKUP_DIR
/
$httpdconfname
"
_info
"JFYI, Config file
$httpdconf
is backuped to
$APACHE_CONF_BACKUP_DIR
/
$httpdconfname
"
_info
"In case there is an error that can not be restored automatically, you may try restore it yourself."
_info
"In case there is an error that can not be restored automatically, you may try restore it yourself."
_info
"The backup file will be deleted on sucess, just forget it."
_info
"The backup file will be deleted on sucess, just forget it."
...
@@ -1585,7 +1585,7 @@ installcert() {
...
@@ -1585,7 +1585,7 @@ installcert() {
if
[
"
$Le_RealCertPath
"
]
;
then
if
[
"
$Le_RealCertPath
"
]
;
then
if
[
-f
"
$Le_RealCertPath
"
]
;
then
if
[
-f
"
$Le_RealCertPath
"
]
;
then
cp
-p
"
$Le_RealCertPath
"
"
$Le_RealCertPath
"
.bak
cp
"
$Le_RealCertPath
"
"
$Le_RealCertPath
"
.bak
fi
fi
cat
"
$CERT_PATH
"
>
"
$Le_RealCertPath
"
cat
"
$CERT_PATH
"
>
"
$Le_RealCertPath
"
fi
fi
...
@@ -1596,7 +1596,7 @@ installcert() {
...
@@ -1596,7 +1596,7 @@ installcert() {
cat
"
$CA_CERT_PATH
"
>>
"
$Le_RealCACertPath
"
cat
"
$CA_CERT_PATH
"
>>
"
$Le_RealCACertPath
"
else
else
if
[
-f
"
$Le_RealCACertPath
"
]
;
then
if
[
-f
"
$Le_RealCACertPath
"
]
;
then
cp
-p
"
$Le_RealCACertPath
"
"
$Le_RealCACertPath
"
.bak
cp
"
$Le_RealCACertPath
"
"
$Le_RealCACertPath
"
.bak
fi
fi
cat
"
$CA_CERT_PATH
"
>
"
$Le_RealCACertPath
"
cat
"
$CA_CERT_PATH
"
>
"
$Le_RealCACertPath
"
fi
fi
...
@@ -1605,14 +1605,14 @@ installcert() {
...
@@ -1605,14 +1605,14 @@ installcert() {
if
[
"
$Le_RealKeyPath
"
]
;
then
if
[
"
$Le_RealKeyPath
"
]
;
then
if
[
-f
"
$Le_RealKeyPath
"
]
;
then
if
[
-f
"
$Le_RealKeyPath
"
]
;
then
cp
-p
"
$Le_RealKeyPath
"
"
$Le_RealKeyPath
"
.bak
cp
"
$Le_RealKeyPath
"
"
$Le_RealKeyPath
"
.bak
fi
fi
cat
"
$CERT_KEY_PATH
"
>
"
$Le_RealKeyPath
"
cat
"
$CERT_KEY_PATH
"
>
"
$Le_RealKeyPath
"
fi
fi
if
[
"
$Le_RealFullChainPath
"
]
;
then
if
[
"
$Le_RealFullChainPath
"
]
;
then
if
[
-f
"
$Le_RealFullChainPath
"
]
;
then
if
[
-f
"
$Le_RealFullChainPath
"
]
;
then
cp
-p
"
$Le_RealFullChainPath
"
"
$Le_RealFullChainPath
"
.bak
cp
"
$Le_RealFullChainPath
"
"
$Le_RealFullChainPath
"
.bak
fi
fi
cat
"
$CERT_FULLCHAIN_PATH
"
>
"
$Le_RealFullChainPath
"
cat
"
$CERT_FULLCHAIN_PATH
"
>
"
$Le_RealFullChainPath
"
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment