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
Guillaume Hervier
slapos.package
Commits
b85793dd
Commit
b85793dd
authored
Nov 12, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure we remove openvpn file AFTER slapos installation.
SlapOS package will readd it.
parent
c0198103
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
slapprepare/slapprepare/__init__.py
slapprepare/slapprepare/__init__.py
+5
-6
No files found.
slapprepare/slapprepare/__init__.py
View file @
b85793dd
...
...
@@ -286,12 +286,6 @@ def slapserver(config):
os
.
chown
(
ssh_key_path
,
uid
,
gid
)
os
.
chmod
(
ssh_key_path
,
0600
)
# Put file to force VPN if user asked
if
not
config
.
force_vpn
:
if
not
dry_run
:
_call
([
'rm'
,
'-f'
,
os
.
path
.
join
(
config
.
slapos_configuration
,
'openvpn-needed'
)])
# Put file to force VPN if user asked
if
config
.
force_slapcontainer
:
if
not
dry_run
:
...
...
@@ -321,6 +315,7 @@ def slapserver(config):
print
"Removing %r"
%
path
if
not
dry_run
:
os
.
remove
(
path
)
finally
:
print
"SlapOS Image configuration: DONE"
return
0
...
...
@@ -562,6 +557,10 @@ def slapprepare():
configureNtp
()
# Remove use of openvpn if not explicitely defined
if
not
config
.
force_vpn
and
not
config
.
dry_run
:
os
.
remove
(
os
.
path
.
join
(
config
.
slapos_configuration
,
'openvpn-needed'
))
# Enable and run slapos-boot-dedicated.service
_call
([
'systemctl'
,
'enable'
,
'slapos-boot-dedicated.service'
])
_call
([
'systemctl'
,
'start'
,
'slapos-boot-dedicated.service'
])
...
...
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