Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos
Commits
956c3583
Commit
956c3583
authored
Jul 25, 2013
by
Vivien Alger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correcting new postfix service
parent
07e87e75
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
software/davstorage/common.cfg
software/davstorage/common.cfg
+2
-2
software/davstorage/instance-davstorage.cfg
software/davstorage/instance-davstorage.cfg
+1
-1
software/davstorage/templates/postfix.in
software/davstorage/templates/postfix.in
+5
-4
No files found.
software/davstorage/common.cfg
View file @
956c3583
...
@@ -85,7 +85,7 @@ mode = 0644
...
@@ -85,7 +85,7 @@ mode = 0644
[instance-davstorage]
[instance-davstorage]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum =
7f3be7bf2b4de1624b990846c5712c44
md5sum =
26ff128c6d5b999596002ef1d97ad8fb
output = ${buildout:directory}/template-davstorage.cfg
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
mode = 0644
...
@@ -120,7 +120,7 @@ url = ${:_profile_base_location_}/templates/${:filename}
...
@@ -120,7 +120,7 @@ url = ${:_profile_base_location_}/templates/${:filename}
filename = postfix.in
filename = postfix.in
download-only = true
download-only = true
mode = 0755
mode = 0755
md5sum =
29b98e2f3ac937c1e4e73c43a562a2d0
md5sum =
9f136d6c217f26e06f7437ceeb7b0c42
[sendmail-script-template]
[sendmail-script-template]
recipe = hexagonit.recipe.download
recipe = hexagonit.recipe.download
...
...
software/davstorage/instance-davstorage.cfg
View file @
956c3583
...
@@ -237,7 +237,7 @@ postfix-config-dir = $${directory:postfix-conf}
...
@@ -237,7 +237,7 @@ postfix-config-dir = $${directory:postfix-conf}
pid-location = $${directory:pid}/master.pid
pid-location = $${directory:pid}/master.pid
output = $${basedirectory:services}/postfix
output = $${basedirectory:services}/postfix
mode = 0755
mode = 0755
md5sum = 9
4799688bf95fb16b86972a23df13af
2
md5sum = 9
f136d6c217f26e06f7437ceeb7b0c4
2
[sendmail-script]
[sendmail-script]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
...
...
software/davstorage/templates/postfix.in
View file @
956c3583
...
@@ -4,12 +4,13 @@ import signal
...
@@ -4,12 +4,13 @@ import signal
import time
import time
def handler(signum,frame):
def handler(signum,frame):
subprocess.call("kill -9 `cat ${:pid-location}`")
pid_file = open("${:pid-location}","r")
pid = pid_file.read().strip()
subprocess.call(["kill", "-9", pid])
subprocess.call(
"${:postfix-location} -c ${:postfix-config-dir} start"
)
subprocess.call(
["${:postfix-location}", "-c", "${:postfix-config-dir}", "start"]
)
signal.signal(
-1
,handler)
signal.signal(
signal.SIGINT
,handler)
while True:
while True:
time.sleep(120)
time.sleep(120)
\ No newline at end of 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