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
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.package
Commits
8732f735
Commit
8732f735
authored
Aug 27, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove sshd from all the configure scripts
parent
91757c4a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
8 deletions
+5
-8
windows/scripts/pre-uninstall.sh
windows/scripts/pre-uninstall.sh
+1
-1
windows/scripts/slapos-configure.sh
windows/scripts/slapos-configure.sh
+2
-2
windows/scripts/slapos-cron-config
windows/scripts/slapos-cron-config
+1
-3
windows/scripts/slapos-include.sh
windows/scripts/slapos-include.sh
+0
-1
windows/scripts/useradd
windows/scripts/useradd
+1
-1
No files found.
windows/scripts/pre-uninstall.sh
View file @
8732f735
...
@@ -88,7 +88,7 @@ for _name in $(NET USER) ; do
...
@@ -88,7 +88,7 @@ for _name in $(NET USER) ; do
if
[[
"
${
_name
}
"
==
${
slapos_user_basename
}*
]]
;
then
if
[[
"
${
_name
}
"
==
${
slapos_user_basename
}*
]]
;
then
echo
"Removing user:
${
_name
}
"
echo
"Removing user:
${
_name
}
"
NET USER
${
_name
}
/DELETE
&&
echo
OK.
NET USER
${
_name
}
/DELETE
&&
echo
OK.
elif
echo
"
${
_name
}
"
|
grep
-q
-E
"(
sshd)|(
cyg_server)|(
${
slapos_administrator
}
)"
;
then
elif
echo
"
${
_name
}
"
|
grep
-q
-E
"(cyg_server)|(
${
slapos_administrator
}
)"
;
then
echo
"Removing user:
${
_name
}
"
echo
"Removing user:
${
_name
}
"
NET USER
${
_name
}
/DELETE
&&
echo
OK.
NET USER
${
_name
}
/DELETE
&&
echo
OK.
fi
fi
...
...
windows/scripts/slapos-configure.sh
View file @
8732f735
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
# * Create user slaproot who owns Administrator group rights
# * Create user slaproot who owns Administrator group rights
#
#
# * Configure and start cygwin service: cygserver, syslog-ng
, sshd
# * Configure and start cygwin service: cygserver, syslog-ng
#
#
# * config: Create node and client configure file by parameters ca/key
# * config: Create node and client configure file by parameters ca/key
#
#
...
@@ -166,7 +166,7 @@ slapos_check_and_create_privileged_user ${_administrator} ${_password} ||
...
@@ -166,7 +166,7 @@ slapos_check_and_create_privileged_user ${_administrator} ${_password} ||
csih_error
"failed to create account
${
_administrator
}
."
csih_error
"failed to create account
${
_administrator
}
."
# -----------------------------------------------------------
# -----------------------------------------------------------
# Configure cygwin services: cygserver syslog-ng
sshd
# Configure cygwin services: cygserver syslog-ng
# -----------------------------------------------------------
# -----------------------------------------------------------
csih_inform
"Starting configure cygwin services ..."
csih_inform
"Starting configure cygwin services ..."
if
!
cygrunsrv
--query
${
cygserver_service_name
}
>
/dev/null 2>&1
;
then
if
!
cygrunsrv
--query
${
cygserver_service_name
}
>
/dev/null 2>&1
;
then
...
...
windows/scripts/slapos-cron-config
View file @
8732f735
...
@@ -559,7 +559,7 @@ create_user() {
...
@@ -559,7 +559,7 @@ create_user() {
echo
echo
echo
"Attempting to find or create a privileged user."
echo
"Attempting to find or create a privileged user."
for
username
in
${
slapos_administrator
}
cyg_server cron_server
sshd_server
for
username
in
${
slapos_administrator
}
cyg_server cron_server
do
do
if
net user
"
${
username
}
"
1> /dev/null 2>&1
;
then
if
net user
"
${
username
}
"
1> /dev/null 2>&1
;
then
[
-z
"
${
first_account
}
"
]
&&
first_account
=
"
${
username
}
"
[
-z
"
${
first_account
}
"
]
&&
first_account
=
"
${
username
}
"
...
@@ -634,8 +634,6 @@ create_user() {
...
@@ -634,8 +634,6 @@ create_user() {
if
[
"
${
username_in_admingroup
}
"
!=
"yes"
]
if
[
"
${
username_in_admingroup
}
"
!=
"yes"
]
then
then
echo
"ERROR: Adding user
${
username
}
to group
${
_admingroup
}
failed!"
echo
"ERROR: Adding user
${
username
}
to group
${
_admingroup
}
failed!"
echo
"Please add
${
username
}
to group
${
_admingroup
}
before"
echo
"starting the sshd service!"
echo
echo
ret
=
1
ret
=
1
fi
fi
...
...
windows/scripts/slapos-include.sh
View file @
8732f735
...
@@ -50,7 +50,6 @@ declare -r slapos_user_basename=${slapos_prefix:-slap}user
...
@@ -50,7 +50,6 @@ declare -r slapos_user_basename=${slapos_prefix:-slap}user
declare
-r
slapos_ifname
=
${
slapos_prefix
}
re6stnet-lo
declare
-r
slapos_ifname
=
${
slapos_prefix
}
re6stnet-lo
declare
-r
re6stnet_service_name
=
${
slapos_prefix
}
re6stnet
declare
-r
re6stnet_service_name
=
${
slapos_prefix
}
re6stnet
declare
-r
cron_service_name
=
${
slapos_prefix
}
cron
declare
-r
cron_service_name
=
${
slapos_prefix
}
cron
declare
-r
sshd_service_name
=
${
slapos_prefix
}
sshd
declare
-r
syslog_service_name
=
${
slapos_prefix
}
syslog-ng
declare
-r
syslog_service_name
=
${
slapos_prefix
}
syslog-ng
declare
-r
cygserver_service_name
=
${
slapos_prefix
}
cygserver
declare
-r
cygserver_service_name
=
${
slapos_prefix
}
cygserver
...
...
windows/scripts/useradd
View file @
8732f735
...
@@ -61,7 +61,7 @@ fi
...
@@ -61,7 +61,7 @@ fi
# Routine: create_unprivileged_user
# Routine: create_unprivileged_user
# Creates a new (unprivileged) user as specified by $1.
# Creates a new (unprivileged) user as specified by $1.
# Useful for running services that do not require elevated privileges,
# Useful for running services that do not require elevated privileges,
# or running servers like
sshd
in "privilege separation" mode.
# or running servers like
cron
in "privilege separation" mode.
#
#
# Exits on catastrophic error
# Exits on catastrophic error
# Returns 0 on total success
# Returns 0 on total success
...
...
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