summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/lists/files/etc/sympa/sympa.conf4
-rw-r--r--roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup8
-rw-r--r--roles/wiki/files/var/www/fripost.org/autoconfig/mail/config-v1.1.xml2
3 files changed, 7 insertions, 7 deletions
diff --git a/roles/lists/files/etc/sympa/sympa.conf b/roles/lists/files/etc/sympa/sympa.conf
index 5fe9405..606bd59 100644
--- a/roles/lists/files/etc/sympa/sympa.conf
+++ b/roles/lists/files/etc/sympa/sympa.conf
@@ -1,35 +1,35 @@
###\\\\ Site customization ////###
## Main robot hostname
domain lists.fripost.org
## Local part of sympa email address
## Effective address will be [EMAIL]@[HOST]
email sympa
## Listmasters email list comma separated
## Sympa will associate listmaster privileges to these email addresses (mail and web interfaces). Some error reports may also be sent to these addresses.
listmaster listmaster@fripost.org
## URL of main Web page
-#wwsympa_url http://lists.fripost.org/sympa
+#wwsympa_url https://lists.fripost.org/sympa
max_wrong_password 19
## Directory for storing static contents (CSS, members pictures, documentation) directly delivered by Apache
static_content_path /var/lib/sympa/static_content
## URL mapped with the static_content_path directory defined above
static_content_url /static-sympa
css_url /static-sympa/css
## Secret used by Sympa to make MD5 fingerprint in web cookies secure
## Should not be changed ! May invalid all user password
cookie `cat /etc/sympa/cookie`
## Who is able to create lists
## This parameter is a scenario, check sympa documentation about scenarios if you want to define one
create_list intranet
###\\\\ Directories ////###
@@ -300,24 +300,24 @@ dkim_signature_apply_on md5_authenticated_messages,smime_authenticated_messages,
###\\\\ Tag based spam filtering ////###
## If a spam filter (like spamassassin or j-chkmail) add a smtp headers to tag spams, name of this header (example X-Spam-Status)
antispam_tag_header_name X-Spam-Status
## Regexp applied on this header to verify message is a spam (example \s*Yes)
antispam_tag_header_spam_regexp ^\s*Yes
## Regexp applied on this header to verify message is NOT a spam (example \s*No)
antispam_tag_header_ham_regexp ^\s*No
## Messages are supposed to be filtered by an antispam that add one more headers to messages. This parameter is used to select a special scenario in order to decide the message spam status: ham, spam or unsure. This parameter replace antispam_tag_header_name, antispam_tag_header_spam_regexp and antispam_tag_header_ham_regexp.
spam_status x-spam-status
###\\\\ Web interface parameters ////###
edit_list owner
## URL of a virtual host
-#http_host http://fripost.org
+#http_host https://fripost.org
## The password validation techniques to be used against user passwords that are added to mailing lists. Options come from Data::Password (http://search.cpan.org/~razinf/Data-Password-1.07/Password.pm#VARIABLES)
#password_validation MINLEN=8,GROUPS=3,DICTIONARY=4,DICTIONARIES=/pentest/dictionaries
diff --git a/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup b/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
index 94c7a1f..23537b0 100644
--- a/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
+++ b/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
@@ -6,43 +6,43 @@
# wrappers and build the wiki.
#
# Remember to re-run ikiwiki --setup any time you edit this file.
#
# name of the wiki
wikiname: Fripost wiki
# contact email for wiki
adminemail: admin@fripost.org
# users who are wiki admins
adminuser:
- gustaveek
- Grégoire
- moza
# users who are banned from the wiki
banned_users: []
# where the source of the wiki is located
srcdir: /var/lib/ikiwiki/fripost-wiki
# where to build the wiki
destdir: /var/lib/ikiwiki/public_html/fripost-wiki
# base url to the wiki
-url: http://wiki.fripost.org
+url: https://wiki.fripost.org
# url to the ikiwiki.cgi
-cgiurl: http://wiki.fripost.org/ikiwiki.cgi
+cgiurl: https://wiki.fripost.org/ikiwiki.cgi
# do not adjust cgiurl if CGI is accessed via different URL
reverse_proxy: 0
# filename of cgi wrapper to generate
cgi_wrapper: /var/lib/ikiwiki/public_html/ikiwiki.cgi
# mode for cgi_wrapper (can safely be made suid)
cgi_wrappermode: 06755
# number of seconds to delay CGI requests when overloaded
cgi_overload_delay: ''
# message to display when overloaded (may contain html)
cgi_overload_message: ''
# enable optimization of only refreshing committed changes?
only_committed_changes: 0
# rcs backend to use
rcs: git
# plugins to add to the default configuration
add_plugins:
- goodstuff
- websetup
- 404
- remove
@@ -120,43 +120,43 @@ cookiejar:
useragent: ikiwiki/3.20141016.2
######################################################################
# core plugins
# (editpage, git, htmlscrubber, inline, link, meta, parentlinks,
# templatebody)
######################################################################
# git plugin
# git hook to generate
git_wrapper: /var/lib/ikiwiki/wiki.fripost.org
# shell command for git_wrapper to run, in the background
#git_wrapper_background_command: git push github
# mode for git_wrapper (can safely be made suid)
#git_wrappermode: 06755
# git pre-receive hook to generate
#git_test_receive_wrapper: /git/wiki.git/hooks/pre-receive
# unix users whose commits should be checked by the pre-receive hook
#untrusted_committers: []
# gitweb url to show file history ([[file]] substituted)
-historyurl: http://git.fripost.org/fripost-wiki/tree/[[file]]
+historyurl: https://git.fripost.org/fripost-wiki/tree/[[file]]
# gitweb url to show a diff ([[file]], [[sha1_to]], [[sha1_from]], [[sha1_commit]], and [[sha1_parent]] substituted)
-diffurl: http://git.fripost.org/fripost-wiki/diff/[[file]]/?id=[[sha1_commit]]
+diffurl: https://git.fripost.org/fripost-wiki/diff/[[file]]/?id=[[sha1_commit]]
# where to pull and push changes (set to empty string to disable)
gitorigin_branch: origin
# branch that the wiki is stored in
gitmaster_branch: master
# htmlscrubber plugin
# PageSpec specifying pages not to scrub
#htmlscrubber_skip: '!*/Discussion'
# inline plugin
# enable rss feeds by default?
rss: 1
# enable atom feeds by default?
atom: 1
# allow rss feeds to be used?
#allowrss: 0
# allow atom feeds to be used?
#allowatom: 0
# urls to ping (using XML-RPC) on feed update
#pingurl: http://rpc.technorati.com/rpc/ping
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
index ccfb02c..44d3732 100644
--- 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
@@ -5,35 +5,35 @@
<displayName>Fripost — 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/">
+ <documentation url="https://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>