diff --git a/production/host_vars/ror.dmz.mateu.be.yml b/production/host_vars/ror.dmz.mateu.be.yml new file mode 100644 index 0000000..6fbf02f --- /dev/null +++ b/production/host_vars/ror.dmz.mateu.be.yml @@ -0,0 +1,58 @@ +scootaloo_twitter_consumer_key: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 37666630316233386366316166376264323661393833616439343039666535366166343939373434 + 6662336161393737616166623863343533343333363432390a353334343363353562613831323561 + 64396565373230326166373737663137376663343837313230313836383839336339393666306339 + 6563306332663866620a323639616233353962396465323062353031333562656434656333343636 + 6238 + +scootaloo_twitter_consumer_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 38353734613734666365323865343736383366356333386366366536636133353430376432313232 + 3662353266346134346236366561613465613335373635330a656636666231336366396565343766 + 65383833373030386566393930333432313731343665323334323966366134646638386536353337 + 3633333462613036660a373334363866303265333337323063626665613431303561323464613534 + 34663934333430626337643630303036396337393661376636353235393535656362 + +scootaloo_twitter_access_key: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 32323331323735383561613034353737643735643438633738363831373039616637313433323032 + 3133633731633430303363346261663838313130316233350a623764643738373863346438393362 + 61303537656366356537356132633432616334623532323931663137623339383664306562343334 + 3263306261666537620a306230616166376465316533356137393832626266666639323961393536 + 3833 + +scootaloo_twitter_access_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 32393564383137326563356566336232303966633135373134366635666432623833333265323063 + 3336366566626661326662336339326261663530356532360a306463613461623639313536656530 + 37623762376463326433373963633839636566343932636165373461313836663761383663653338 + 3864646535363437650a616133383631646335373631313631343766346635336137666136306661 + 3565 + +scootaloo_mastodon_client_id: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 35613332363032343232383538656665636333333938336232376665323439313161316361393466 + 6438323864646662323733623831383235373963366466300a666135363161383966373130383063 + 65396436303135326438633065363036636334366164386463383666626662376533366161363937 + 3739633738623661380a373863353136626436653037316633626561303264633131396265316466 + 38346664316130346537343164386239343261626339323034366539376534633165313664336366 + 3565363763643130626432323466303366613538626236663466 + +scootaloo_mastodon_client_secret: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 66393566323061383639323662626464656634343331643131636639643831303962666133333030 + 3635303665313666646462346362313664383166353665660a366435623361363532386539666232 + 39313730613531623235343961643936303662356635643962653736366539323266623231666533 + 6262346337323531650a646138343063383130613637306166343537376666333939333365373339 + 39343561623164306464396362313935353832343131623363306130333539616466363235666664 + 3365333565396532656538656563663765386537613932396632 + +scootaloo_mastodon_token: !vault | + $ANSIBLE_VAULT;1.1;AES256 + 39383363646137363931386663393237656631376565376139383762626636373638363035633061 + 6639366563366336646365353861666466383265323439340a633935666430616264643038613137 + 63323037653139376233336266306465333030353737633638323738373862636532386661333636 + 6438323963616538370a313432393230656663323239363230393632326638306138323863306561 + 61373335653535626437663036393739333563343031653236383539343530633236333363663966 + 6461323931316637343136383736343562393432323235383332 diff --git a/roles/spamassassin/files/local.cf b/roles/spamassassin/files/local.cf index b7bda51..42760ac 100644 --- a/roles/spamassassin/files/local.cf +++ b/roles/spamassassin/files/local.cf @@ -67,6 +67,7 @@ score LOCAL_BITCOIN 10.0 whitelist_from *@chichiclothing.com # Blacklist manuel +blacklist_from th.lesage@gmail.com blacklist_from *@azartios.de blacklist_from *@samage.fr blacklist_from *@*.at diff --git a/roles/webapps/files/bin/scootaloo b/roles/webapps/files/bin/scootaloo new file mode 100644 index 0000000..4947c8e Binary files /dev/null and b/roles/webapps/files/bin/scootaloo differ diff --git a/roles/webapps/tasks/feed2toot.yml b/roles/webapps/tasks/feed2toot.yml deleted file mode 100644 index acc1736..0000000 --- a/roles/webapps/tasks/feed2toot.yml +++ /dev/null @@ -1,23 +0,0 @@ -- name: install pip3 - package: - name: python3-pip - state: present - -- name: install feed2toot - pip: - name: feed2toot - state: present - -- name: cron for feed2toot - cron: - name: F2T Dojo - user: www-data - minute: "*/15" - job: "/usr/local/bin/feed2toot -c /srv/docker/m.nintendojo.fr/feed2toot/feed2toot.ini" - -- name: config dir for feed2toot - file: - path: /var/www/.config - owner: www-data - group: www-data - state: directory diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml index 6fe00f9..3416d8c 100644 --- a/roles/webapps/tasks/main.yml +++ b/roles/webapps/tasks/main.yml @@ -13,8 +13,8 @@ - name: WP for NintendojoFR include_tasks: wp_dojo.yml when: inventory_hostname == 'web2.dmz.mateu.be' -- name: feed2toot for Mastodon - include_tasks: feed2toot.yml +- name: Scootaloo for Mastodon + include_tasks: scootaloo.yml when: inventory_hostname == 'ror.dmz.mateu.be' - name: tootctl for mastodon include_tasks: tootctl.yml diff --git a/roles/webapps/tasks/scootaloo.yml b/roles/webapps/tasks/scootaloo.yml new file mode 100644 index 0000000..9b42427 --- /dev/null +++ b/roles/webapps/tasks/scootaloo.yml @@ -0,0 +1,31 @@ +- name: install scootaloo + copy: + src: files/bin/scootaloo + dest: "/usr/local/bin/scootaloo" + owner: root + group: www-data + mode: 0750 + +- name: create last tweet file + file: + path: /usr/local/etc/last_tweet + state: touch + owner: www-data + group: www-data + mode: 0750 + +- name: put configuration file + template: + src: scootaloo.toml.j2 + dest: /usr/local/etc/scootaloo.toml + owner: root + group: www-data + mode: 0640 + +- name: cron for scootaloo + cron: + name: Scootaloo Dojo + user: www-data + minute: "*/5" + job: "/usr/local/bin/scootaloo" + diff --git a/roles/webapps/templates/scootaloo.toml.j2 b/roles/webapps/templates/scootaloo.toml.j2 new file mode 100644 index 0000000..3ddd898 --- /dev/null +++ b/roles/webapps/templates/scootaloo.toml.j2 @@ -0,0 +1,19 @@ +[scootaloo] + +last_tweet_path="/usr/local/etc/last_tweet" +cache_path="/tmp/scootaloo" + +[twitter] +username="NintendojoFR" + +consumer_key="{{ scootaloo_twitter_consumer_key }}" +consumer_secret="{{ scootaloo_twitter_consumer_secret }}" +access_key="{{ scootaloo_twitter_access_key }}" +access_secret="{{ scootaloo_twitter_access_secret }}" + +[mastodon] +base = "https://m.nintendojo.fr" +client_id = "{{ scootaloo_mastodon_client_id }}" +client_secret = "{{ scootaloo_mastodon_client_secret }}" +redirect = "urn:ietf:wg:oauth:2.0:oob" +token = "{{ scootaloo_mastodon_token }}"