diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/wiki/files/etc/nginx/sites-available/website | 3 | ||||
| -rw-r--r-- | roles/wiki/files/var/www/fripost.org/autoconfig/mail/config-v1.1.xml | 39 | ||||
| -rw-r--r-- | roles/wiki/tasks/main.yml | 12 |
3 files changed, 54 insertions, 0 deletions
diff --git a/roles/wiki/files/etc/nginx/sites-available/website b/roles/wiki/files/etc/nginx/sites-available/website index 0c25f4e..3513510 100644 --- a/roles/wiki/files/etc/nginx/sites-available/website +++ b/roles/wiki/files/etc/nginx/sites-available/website @@ -25,25 +25,28 @@ server { ssl_certificate /etc/nginx/ssl/fripost.org.chained.pem; ssl_certificate_key /etc/nginx/ssl/fripost.org.key; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log info; location / { try_files $uri $uri/ =404; index index.html; root /var/lib/ikiwiki/public_html/fripost-wiki/website; } location /static/ { alias /var/lib/ikiwiki/public_html/fripost-wiki/static/; } location /material/ { alias /var/www/fripost.org/material/; } location /minutes/ { alias /var/www/fripost.org/minutes/; } + location /.well-known/autoconfig/ { + alias /var/www/fripost.org/autoconfig/; + } location = /ikiwiki.cgi { return 403; } } diff --git a/roles/wiki/files/var/www/fripost.org/autoconfig/mail/config-v1.1.xml b/roles/wiki/files/var/www/fripost.org/autoconfig/mail/config-v1.1.xml new file mode 100644 index 0000000..e70b0be --- /dev/null +++ b/roles/wiki/files/var/www/fripost.org/autoconfig/mail/config-v1.1.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<clientConfig version="1.1"> + <emailProvider id="fripost.org"> + <domain>fripost.org</domain> + + <displayName>Fripost &endash; demokratisk e-post</displayName> + <displayShortName>Fripost</displayShortName> + + <incomingServer type="imap"> + <hostname>imap.fripost.org</hostname> + <port>993</port> + <socketType>SSL</socketType> + <username>%EMAILADDRESS%</username> + <authentication>password-cleartext</authentication> + </incomingServer> + + <outgoingServer type="smtp"> + <hostname>smtp.fripost.org</hostname> + <port>587</port> + <socketType>STARTTLS</socketType> + <username>%EMAILADDRESS%</username> + <authentication>password-cleartext</authentication> + </outgoingServer> + + <documentation url="http://wiki.fripost.org/konfigurera/"> + <descr lang="en">Configure your email client for Fripost</descr> + <descr lang="sv">Konfigurerar din e-postklient för Fripost</descr> + </documentation> + </emailProvider> + + <webMail> + <loginPage url="https://mail.fripost.org/" /> + <loginPageInfo url="https://mail.fripost.org/"> + <username>%EMAILADDRESS%</username> + <usernameField id="rcmloginuser" name="_user" /> + <passwordField id="rcmloginpwd" name="_pass" /> + </loginPageInfo> + </webMail> +</clientConfig> diff --git a/roles/wiki/tasks/main.yml b/roles/wiki/tasks/main.yml index c8a0d0f..7aa4d1d 100644 --- a/roles/wiki/tasks/main.yml +++ b/roles/wiki/tasks/main.yml @@ -82,20 +82,32 @@ owner=root group=root mode=0644 register: r2 with_items: - website - wiki notify: - Restart Nginx - name: Create /etc/nginx/sites-enabled/{wiki,website} file: src=../sites-available/{{ item }} dest=/etc/nginx/sites-enabled/{{ item }} owner=root group=root state=link force=yes register: r3 with_items: - website - wiki notify: - Restart Nginx + +- name: Create directory /var/www/fripost.org/autoconfig/mail + file: path=/var/www/fripost.org/autoconfig/mail + state=directory + owner=root group=root + mode=0755 + +- name: Copy /var/www/fripost.org/autoconfig/mail/config-v1.1.xml + copy: src=var/www/fripost.org/autoconfig/mail/config-v1.1.xml + dest=/var/www/fripost.org/autoconfig/mail/config-v1.1.xml + owner=root group=root + mode=0644 |