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
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
Steven Gueguen
slapos
Commits
4d0f9213
Commit
4d0f9213
authored
Feb 15, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP
parent
cbbd94ee
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
software/dovecot/buildout.hash.cfg
software/dovecot/buildout.hash.cfg
+3
-3
software/dovecot/instance-default.cfg.in
software/dovecot/instance-default.cfg.in
+14
-3
software/dovecot/instance.cfg.in
software/dovecot/instance.cfg.in
+0
-1
software/dovecot/postfix_master.jinja2.cf
software/dovecot/postfix_master.jinja2.cf
+1
-1
No files found.
software/dovecot/buildout.hash.cfg
View file @
4d0f9213
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
76fdf5d64f6575c37ef5aeeea9d6d35e
md5sum =
f8a8196d12e3402ec636fadda8bcdf76
[template-default]
[template-default]
_update_hash_filename_ = instance-default.cfg.in
_update_hash_filename_ = instance-default.cfg.in
md5sum =
cd9b3878e40c9d72033569c6d1064331
md5sum =
9f9a86a49e31b1cf76115e1bd979517a
[dovecot.jinja2.conf]
[dovecot.jinja2.conf]
_update_hash_filename_ = dovecot.jinja2.conf
_update_hash_filename_ = dovecot.jinja2.conf
...
@@ -33,7 +33,7 @@ _update_hash_filename_ = postfix_main.jinja2.cf
...
@@ -33,7 +33,7 @@ _update_hash_filename_ = postfix_main.jinja2.cf
md5sum = 42297525b54d859aa0fd7841a162b17c
md5sum = 42297525b54d859aa0fd7841a162b17c
[postfix_master.jinja2.cf]
[postfix_master.jinja2.cf]
_update_hash_filename_ = postfix_master.jinja2.cf
_update_hash_filename_ = postfix_master.jinja2.cf
md5sum =
ef164517e3f7170d03499967d625c3bb
md5sum =
7752a8b4af5c18dc404e0a862af89272
[postfix_alias.jinja2]
[postfix_alias.jinja2]
_update_hash_filename_ = postfix_alias.jinja2
_update_hash_filename_ = postfix_alias.jinja2
md5sum = 170fcb64781e966fa1a9718b5a925535
md5sum = 170fcb64781e966fa1a9718b5a925535
...
...
software/dovecot/instance-default.cfg.in
View file @
4d0f9213
...
@@ -6,6 +6,7 @@ parts =
...
@@ -6,6 +6,7 @@ parts =
postfix-conf-main
postfix-conf-main
postfix-conf-master
postfix-conf-master
postfix-service
postfix-service
postfix-symlinks-libexec
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline= true
offline= true
...
@@ -29,6 +30,8 @@ script = ${:etc}/run
...
@@ -29,6 +30,8 @@ script = ${:etc}/run
service = ${:etc}/service
service = ${:etc}/service
promise = ${:etc}/promise
promise = ${:etc}/promise
log = ${:var}/log
log = ${:var}/log
usr-postfix = ${:usr}/postfix
etc-postfix = ${:etc}/postfix
var-log = ${:var}/log
var-log = ${:var}/log
var-lib = ${:var}/lib
var-lib = ${:var}/lib
var-lib-postfix = ${:var-lib}/postfix
var-lib-postfix = ${:var-lib}/postfix
...
@@ -103,7 +106,7 @@ init =
...
@@ -103,7 +106,7 @@ init =
[postfix-conf-main]
[postfix-conf-main]
<= config-base
<= config-base
url = {{ postfix_main_template }}
url = {{ postfix_main_template }}
output = ${directory:etc}/
postfix_
main.cf
output = ${directory:etc}/main.cf
extra-context =
extra-context =
key alias_file postfix-alias:output
key alias_file postfix-alias:output
key mailname_file postfix-mailname:output
key mailname_file postfix-mailname:output
...
@@ -123,7 +126,7 @@ extra-context =
...
@@ -123,7 +126,7 @@ extra-context =
[postfix-conf-master]
[postfix-conf-master]
<= config-base
<= config-base
url = {{ postfix_master_template }}
url = {{ postfix_master_template }}
output = ${directory:etc}/
postfix-master
output = ${directory:etc}/
master.cf
[postfix-alias]
[postfix-alias]
<= config-base
<= config-base
url = {{ postfix_alias_template }}
url = {{ postfix_alias_template }}
...
@@ -158,12 +161,18 @@ hash-files =
...
@@ -158,12 +161,18 @@ hash-files =
${dovecot-conf:output}
${dovecot-conf:output}
${dovecot-wrapper:output}
${dovecot-wrapper:output}
[postfix-symlinks-libexec]
recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:usr-postfix}
link-binary =
{{ postfix_location }}/usr/libexec
[postfix-wrapper]
[postfix-wrapper]
recipe = slapos.recipe.template
recipe = slapos.recipe.template
output = ${directory:bin}/${:_buildout_section_name_}
output = ${directory:bin}/${:_buildout_section_name_}
inline =
inline =
#!/bin/sh
#!/bin/sh
{{ postfix_binary }}
${directory:usr-postfix}/libexec/postfix/master
[postfix-service]
[postfix-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
...
@@ -171,6 +180,8 @@ command-line = ${postfix-wrapper:output}
...
@@ -171,6 +180,8 @@ command-line = ${postfix-wrapper:output}
wrapper-path = ${directory:service}/postfix
wrapper-path = ${directory:service}/postfix
mode = 0775
mode = 0775
pidfile = ${directory:run}/postfix.pid
pidfile = ${directory:run}/postfix.pid
environment =
MAIL_CONFIG=${directory:etc-postfix}
hash-files =
hash-files =
${postfix-conf-main:output}
${postfix-conf-main:output}
${postfix-wrapper:output}
${postfix-wrapper:output}
software/dovecot/instance.cfg.in
View file @
4d0f9213
...
@@ -30,7 +30,6 @@ context =
...
@@ -30,7 +30,6 @@ context =
raw postfix_virtual_template ${postfix_virtual.jinja2:target}
raw postfix_virtual_template ${postfix_virtual.jinja2:target}
raw postfix_mailname_template ${postfix_mailname.jinja2:target}
raw postfix_mailname_template ${postfix_mailname.jinja2:target}
raw postfix_vmailbox_template ${postfix_vmailbox.jinja2:target}
raw postfix_vmailbox_template ${postfix_vmailbox.jinja2:target}
raw postfix_binary ${postfix:location}/usr/libexec/sbin/master
raw postfix_location ${postfix:location}
raw postfix_location ${postfix:location}
section slap_connection slap-connection
section slap_connection slap-connection
...
...
software/dovecot/postfix_master.jinja2.cf
View file @
4d0f9213
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# service type private unpriv chroot wakeup maxproc command + args
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
# ==========================================================================
{{ smtp }}
inet n - n - - smtpd
10025
inet n - n - - smtpd
pickup unix n - n 60 1 pickup
pickup unix n - n 60 1 pickup
cleanup unix n - n - 0 cleanup
cleanup unix n - n - 0 cleanup
qmgr unix n - n 300 1 qmgr
qmgr unix n - n 300 1 qmgr
...
...
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