Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
communication
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
infra
ansible-shared
communication
Commits
c52cacea
Commit
c52cacea
authored
6 years ago
by
Lars Beckers
Browse files
Options
Downloads
Patches
Plain Diff
fix ansible deprecation warnings
parent
d9072f4e
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
dovecot/tasks/main.yml
+6
-7
6 additions, 7 deletions
dovecot/tasks/main.yml
postfix/tasks/main.yml
+4
-5
4 additions, 5 deletions
postfix/tasks/main.yml
prosody/tasks/main.yml
+28
-9
28 additions, 9 deletions
prosody/tasks/main.yml
spamassassin/tasks/main.yml
+3
-4
3 additions, 4 deletions
spamassassin/tasks/main.yml
with
41 additions
and
25 deletions
dovecot/tasks/main.yml
+
6
−
7
View file @
c52cacea
...
@@ -2,14 +2,13 @@
...
@@ -2,14 +2,13 @@
-
name
:
ensure all required dovecot packages are installed
-
name
:
ensure all required dovecot packages are installed
apt
:
apt
:
name
:
"
{{
item
}}"
name
:
state
:
present
with_items
:
-
dovecot-core
-
dovecot-core
-
dovecot-imapd
-
dovecot-imapd
-
dovecot-lmtpd
-
dovecot-lmtpd
-
dovecot-managesieved
-
dovecot-managesieved
-
dovecot-sieve
-
dovecot-sieve
state
:
present
tags
:
tags
:
-
dovecot
-
dovecot
-
mail
-
mail
...
...
This diff is collapsed.
Click to expand it.
postfix/tasks/main.yml
+
4
−
5
View file @
c52cacea
...
@@ -2,12 +2,11 @@
...
@@ -2,12 +2,11 @@
-
name
:
ensure all required postfix packages are installed
-
name
:
ensure all required postfix packages are installed
apt
:
apt
:
name
:
"
{{
item
}}"
name
:
state
:
present
with_items
:
-
postfix
-
postfix
-
postfix-pcre
-
postfix-pcre
-
postfix-cdb
-
postfix-cdb
state
:
present
tags
:
tags
:
-
postfix
-
postfix
-
mail
-
mail
...
...
This diff is collapsed.
Click to expand it.
prosody/tasks/main.yml
+
28
−
9
View file @
c52cacea
...
@@ -2,36 +2,55 @@
...
@@ -2,36 +2,55 @@
-
import_tasks
:
postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}"
-
import_tasks
:
postgres.yml db_user="{{prosody_user}}" db_name="{{prosody_db}}"
-
name
:
ensure prosody is installed
-
name
:
ensure prosody is installed
apt
:
name={{ item }} state=present
apt
:
with_items
:
name
:
-
prosody
-
prosody
-
prosody-modules
-
prosody-modules
state
:
present
tags
:
tags
:
-
prosody
-
prosody
-
name
:
ensure minimal config that includes only conf.d is present
-
name
:
ensure minimal config that includes only conf.d is present
copy
:
src=files/prosody.cfg.lua dest=/etc/prosody/cfg.lua mode=0640 owner=root group=prosody
copy
:
src
:
prosody.cfg.lua
dest
:
/etc/prosody/cfg.lua
mode
:
'
0640'
owner
:
root
group
:
prosody
tags
:
tags
:
-
prosody
-
prosody
notify
:
restart prosody
notify
:
restart prosody
-
name
:
ensure templated config is present
-
name
:
ensure templated config is present
template
:
src=templates/{{ item }}.cfg.lua.j2 dest=/etc/prosody/conf.avail/{{ item }}.cfg.lua mode=0640 owner=root group=prosody
template
:
src
:
"
{{
item
}}.cfg.lua.j2"
dest
:
"
/etc/prosody/conf.avail/{{
item
}}.cfg.lua"
mode
:
'
0640'
owner
:
root
group
:
prosody
with_items
:
"
{{
prosody_config_files
}}"
with_items
:
"
{{
prosody_config_files
}}"
tags
:
tags
:
-
prosody
-
prosody
-
name
:
ensure templated config is active
-
name
:
ensure templated config is active
file
:
src=/etc/prosody/conf.avail/{{ item }}.cfg.lua path=/etc/prosody/conf.d/{{ item }}.cfg.lua state=link mode=0640 owner=root group=prosody
file
:
src
:
"
/etc/prosody/conf.avail/{{
item
}}.cfg.lua"
path
:
"
/etc/prosody/conf.d/{{
item
}}.cfg.lua"
state
:
link
mode
:
'
0640'
owner
:
root
group
:
prosody
with_items
:
"
{{
prosody_config_files
}}"
with_items
:
"
{{
prosody_config_files
}}"
tags
:
tags
:
-
prosody
-
prosody
notify
:
restart prosody
notify
:
restart prosody
-
name
:
ensure prosody is running and enables
-
name
:
ensure prosody is running and enables
service
:
name=prosody state=started enabled=yes
service
:
name
:
prosody
state
:
started
enabled
:
yes
tags
:
tags
:
-
prosody
-
prosody
-
meta
:
flush_handlers
-
meta
:
flush_handlers
This diff is collapsed.
Click to expand it.
spamassassin/tasks/main.yml
+
3
−
4
View file @
c52cacea
...
@@ -2,11 +2,10 @@
...
@@ -2,11 +2,10 @@
-
name
:
ensure spamassassin is installed
-
name
:
ensure spamassassin is installed
apt
:
apt
:
name
:
"
{{
item
}}"
name
:
state
:
present
with_items
:
-
spamassassin
-
spamassassin
-
spamc
-
spamc
state
:
present
tags
:
tags
:
-
mail
-
mail
-
spamassassin
-
spamassassin
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment