Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
869578ce
Commit
869578ce
authored
Jun 15, 2016
by
neil
Browse files
minor, fix apache error messaage.
parent
5fc5016d
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
869578ce
...
@@ -996,11 +996,11 @@ _setApache() {
...
@@ -996,11 +996,11 @@ _setApache() {
fi
fi
#test the conf first
#test the conf first
_info
"Checking if there is an error in
your
apache config file before
we
start."
_info
"Checking if there is an error in
the
apache config file before start
ing
."
_msg
=
"
$(
apachectl
-t
2>&1
)
"
_msg
=
"
$(
apachectl
-t
2>&1
)
"
if
[
"
$?
"
!=
"0"
]
;
then
if
[
"
$?
"
!=
"0"
]
;
then
_err
"Sorry, apache config has error, please fix it
by yourself
first, then try again."
_err
"Sorry, apache config
file
has error, please fix it first, then try again."
_err
"Don't worry,
we have not made any
change
s
to your system."
_err
"Don't worry,
there is nothing
change
d
to your system."
_err
"
$_msg
"
_err
"
$_msg
"
return
1
;
return
1
;
else
else
...
@@ -1010,7 +1010,7 @@ _setApache() {
...
@@ -1010,7 +1010,7 @@ _setApache() {
#backup the conf
#backup the conf
_debug
"Backup apache config file"
"
$httpdconf
"
_debug
"Backup apache config file"
"
$httpdconf
"
if
!
cp
"
$httpdconf
"
"
$APACHE_CONF_BACKUP_DIR
/"
;
then
if
!
cp
"
$httpdconf
"
"
$APACHE_CONF_BACKUP_DIR
/"
;
then
_err
"Can not backup apache config file, so abort. Don't worry,
your
apache config is not changed."
_err
"Can not backup apache config file, so abort. Don't worry,
the
apache config is not changed."
_err
"This might be a bug of
$PROJECT_NAME
, pleae report issue:
$PROJECT
"
_err
"This might be a bug of
$PROJECT_NAME
, pleae report issue:
$PROJECT
"
return
1
return
1
fi
fi
...
@@ -1048,9 +1048,9 @@ Allow from all
...
@@ -1048,9 +1048,9 @@ Allow from all
if
[
"
$?
"
!=
"0"
]
;
then
if
[
"
$?
"
!=
"0"
]
;
then
_err
"Sorry, apache config error"
_err
"Sorry, apache config error"
if
_restoreApache
;
then
if
_restoreApache
;
then
_err
"
We have restored your
apache config file."
_err
"
The
apache config file
is restored
."
else
else
_err
"Sorry,
w
e a
re not able to restore the config file, please contact me
."
_err
"Sorry,
Th
e a
pache config file can not be restored, please report bug
."
fi
fi
return
1
;
return
1
;
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