Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
provision
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
provision
Commits
b8f3d2b6
Commit
b8f3d2b6
authored
May 9, 2010
by
Neil Drumm
Committed by
Neil Drumm
May 9, 2010
Browse files
Options
Downloads
Patches
Plain Diff
Clean up restart_command a little.
parent
12804ee0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
http/apache/apache_service.inc
+2
-2
2 additions, 2 deletions
http/apache/apache_service.inc
provision.drush.inc
+5
-4
5 additions, 4 deletions
provision.drush.inc
with
7 additions
and
6 deletions
http/apache/apache_service.inc
+
2
−
2
View file @
b8f3d2b6
...
...
@@ -59,8 +59,8 @@ class provisionService_http_apache extends provisionService_http {
}
function
parse_configs
(
$cause_error
=
FALSE
)
{
//This is required to be configurable, due to the fact that different
hosts might need to do this differently.
//
TODO : test for this instead of relying on a configuration setting?
//
This is required to be configurable, due to the fact that different
//
hosts might need to do this differently.
$return
=
drush_shell_exec
(
escapeshellcmd
(
drush_get_option
(
'restart_cmd'
)));
if
(
!
$return
)
{
$msg
=
join
(
"
\n
"
,
drush_shell_exec_output
());
...
...
This diff is collapsed.
Click to expand it.
provision.drush.inc
+
5
−
4
View file @
b8f3d2b6
...
...
@@ -237,14 +237,15 @@ function drush_http_provision_named_context_save() {
}
function
_provision_default_restart_cmd
()
{
$command
=
'/usr/sbin/apachectl'
;
# a
proper default for most of the world
$command
=
'/usr/sbin/apachectl'
;
// A
proper default for most of the world
foreach
(
explode
(
':'
,
$_SERVER
[
'PATH'
])
as
$path
)
{
$options
[]
=
"
$path
/apache2ctl"
;
$options
[]
=
"
$path
/apachectl"
;
}
# try to detect the apache restart command
$options
[]
=
'/usr/local/sbin/apachectl'
;
# freebsd
$options
[]
=
'/usr/sbin/apache2ctl'
;
# debian + apache2
// Try to detect the apache restart command.
$options
[]
=
'/usr/local/sbin/apachectl'
;
// freebsd
$options
[]
=
'/usr/sbin/apache2ctl'
;
// debian + apache2
$options
[]
=
'/usr/apache2/2.2/bin'
;
// Solaris
$options
[]
=
$command
;
foreach
(
$options
as
$test
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment