Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.package
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
13
Merge Requests
13
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.package
Commits
c164337f
Commit
c164337f
authored
Jul 01, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Exit in 1 minute when configure scripts run successfully
Add cron job in the slapos configure
parent
0d8e02ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
17 deletions
+19
-17
windows/scripts/post-install.sh
windows/scripts/post-install.sh
+1
-1
windows/scripts/pre-uninstall.sh
windows/scripts/pre-uninstall.sh
+1
-1
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+16
-15
windows/scripts/slapos-node.sh
windows/scripts/slapos-node.sh
+1
-0
No files found.
windows/scripts/post-install.sh
View file @
c164337f
...
...
@@ -100,6 +100,6 @@ for x in $(cygrunsrv --list) ; do
done
echo
Run post-install script successfully.
read
-n
1
-p
"Press any key to exit..."
read
-n
1
-
t
60
-
p
"Press any key to exit..."
exit
0
windows/scripts/pre-uninstall.sh
View file @
c164337f
...
...
@@ -31,6 +31,6 @@ for x in $(cygrunsrv --list) ; do
done
echo
Run pre-uninstall script successfully.
read
-n
1
-p
"Press any key to exit..."
read
-n
1
-
t
60
-
p
"Press any key to exit..."
exit
0
windows/scripts/slapos-configure.sh
View file @
c164337f
...
...
@@ -187,16 +187,17 @@ else
echo
The syslog-ng service has been installed.
fi
# echo Checking cron service ...
# cygrunsrv --query cron > /dev/null
# if (( $? )) ; then
# echo Run cron-config ...
# /usr/bin/cron-config --yes || \
# show_error_exit "Failed to run cron-config"
# echo OK.
# else
# echo The cron service has been installed.
# fi
echo
Checking cron job ...
ps
-ef
|
grep
-q
"/usr/sbin/cron"
if
((
$?
))
;
then
echo
Starting cron job ...
/usr/sbin/cron &
((
$?
))
&&
show_error_exit
"Failed to run cron-config"
disown
-h
echo
The cron job started.
else
echo
The cron job is running.
fi
#-------------------------------------------------
# Configure slapos network
...
...
@@ -435,9 +436,9 @@ echo
# here. Get re6stnet client count, then remove extra drivers and add
# required drivers.
#
echo
echo
echo
Installing OpenVPN Tap-Windows Driver ...
echo
echo
original_connections
=
$(
echo
$(
get_all_connections
))
client_count
=
$(
sed
-n
-e
"s/^client-count *//p"
/etc/re6stnet/re6stnet.conf
)
[[
-z
$client_count
]]
&&
client_count
=
10
...
...
@@ -458,7 +459,7 @@ for re6stnet_ifname in $re6stnet_name_list ; do
done
#
# Remove OpenVPN Tap-Windows Driver
#
#
# ip vpntap del dev re6stnet-x
#
...
...
@@ -483,7 +484,7 @@ if (( $? )) ; then
/opt/slapos/bin/slapos node format
-cv
--now
||
show_error_exit
"Failed to run slapos format."
echo
echo
"Supply
$slaprunner_cfg
in the computer
$computer_id
"
/opt/slapos/bin/slapos supply
$slaprunner_cfg
$computer_id
echo
"Request an instance 'Node Runner' ..."
...
...
@@ -565,5 +566,5 @@ EOF
fi
echo
SlapOS Node configure successfully.
read
-n
1
-p
"Press any key to exit..."
read
-n
1
-
t
60
-
p
"Press any key to exit..."
exit
0
windows/scripts/slapos-node.sh
View file @
c164337f
...
...
@@ -120,4 +120,5 @@ echo "Creating instance ..."
echo
"Sending report ..."
/opt/slapos/bin/slapos node report
--verbose
read
-n
1
-t
60
-p
"Press any key to exit..."
exit
0
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