Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
9cd2b885
Commit
9cd2b885
authored
Mar 09, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rc/inc: regenerate the php.ini files in a more maintainable place
parent
804a22fa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
system.inc
src/etc/inc/system.inc
+3
-0
rc
src/etc/rc
+1
-1
rc.initial.firmware
src/etc/rc.initial.firmware
+0
-1
pkg_upgrade.sh
src/opnsense/scripts/pkg_upgrade.sh
+7
-12
No files found.
src/etc/inc/system.inc
View file @
9cd2b885
...
...
@@ -888,6 +888,9 @@ function system_webgui_start()
@
unlink
(
"
{
$g
[
'varrun_path'
]
}
/lighty-webConfigurator.pid"
);
/* regenerate the php.ini files in case the setup has changed */
mwexec
(
'/usr/local/etc/rc.php_ini_setup'
);
/* attempt to start lighthttpd */
$res
=
mwexec
(
"/usr/local/sbin/lighttpd -f
{
$g
[
'varetc_path'
]
}
/lighty-webConfigurator.conf"
);
...
...
src/etc/rc
View file @
9cd2b885
...
...
@@ -307,7 +307,7 @@ echo "done."
# Recreate capabilities DB
/usr/bin/cap_mkdb /etc/login.conf
#
Run the php.ini setup file
#
Set up the correct php.ini content
/usr/local/etc/rc.php_ini_setup
chmod
u+rx /usr/local/opnsense/service/configd.py
...
...
src/etc/rc.initial.firmware
View file @
9cd2b885
...
...
@@ -47,7 +47,6 @@ pkg upgrade -y
echo
# restart the GUI after PHP changes have been applied
/usr/local/etc/rc.php_ini_setup
/usr/local/etc/rc.restart_webgui
echo
...
...
src/opnsense/scripts/pkg_upgrade.sh
View file @
9cd2b885
...
...
@@ -36,25 +36,20 @@ PKG_PROGRESS_FILE=/tmp/pkg_upgrade.progress
if
[
-z
"
$pkg_running
"
]
;
then
echo
"***GOT REQUEST TO UPGRADE:
$package
***"
>>
${
PKG_PROGRESS_FILE
}
if
[
"
$package
"
==
"all"
]
;
then
# start pkg upgrade
echo
'***STARTING UPGRADE***'
>>
${
PKG_PROGRESS_FILE
}
echo
'***STARTING UPGRADE***'
>>
${
PKG_PROGRESS_FILE
}
pkg upgrade
-y
>>
${
PKG_PROGRESS_FILE
}
echo
'***CHECKING FOR MORE UPGRADES, CAN TAKE 30 SECONDS***'
>>
${
PKG_PROGRESS_FILE
}
/usr/local/opnsense/scripts/pkg_updatecheck.sh
echo
'***DONE***'
>>
${
PKG_PROGRESS_FILE
}
else
#
start pkg upgrade
echo
'***STARTING UPGRADE - ONE PACKAGE***'
>>
${
PKG_PROGRESS_FILE
}
#
XXX this is dangerous and not recommended by pkgng devs
echo
'***STARTING UPGRADE - ONE PACKAGE***'
>>
${
PKG_PROGRESS_FILE
}
pkg upgrade
-y
$package
>>
${
PKG_PROGRESS_FILE
}
echo
'***CHECKING FOR MORE UPGRADES, CAN TAKE 30 SECONDS***'
>>
${
PKG_PROGRESS_FILE
}
/usr/local/opnsense/scripts/pkg_updatecheck.sh
echo
'***DONE***'
>>
${
PKG_PROGRESS_FILE
}
fi
echo
'***CHECKING FOR MORE UPGRADES, CAN TAKE 30 SECONDS***'
>>
${
PKG_PROGRESS_FILE
}
/usr/local/opnsense/scripts/pkg_updatecheck.sh
# remove no longer referenced packages
pkg autoremove
-y
>>
${
PKG_PROGRESS_FILE
}
# regenerate php.ini and restart the web server
/usr/local/etc/rc.php_ini_setup
>>
${
PKG_PROGRESS_FILE
}
# restart the web server
/usr/local/opnsense/service/configd_ctl.py
'service restart webgui'
>>
${
PKG_PROGRESS_FILE
}
echo
'***DONE***'
>>
${
PKG_PROGRESS_FILE
}
else
echo
'Upgrade already in progress'
>>
${
PKG_PROGRESS_FILE
}
echo
'***DONE***'
>>
${
PKG_PROGRESS_FILE
}
...
...
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