Thunix
/
ansible
mirror of https://github.com/ThunixdotNet/ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ttm.sh:thunix/ansible

This commit is contained in:
Ubergeek 2019-01-04 18:25:05 +00:00
parent 2ac94d062b 80f3f6821f
commit ed9c1e2ea1
16 changed files with 39 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/common/files/motd
View File

@ -15,6 +15,7 @@ For system document type 'man thunix'.
-----------------------------------------------------------
Available commands:
* chat - Jump into thunix chat
* man thunix - view the Thunix help file
-----------------------------------------------------------
To modify the thunix.cf website, propose a PR here:
https://tildegit.org/thunix/main_site

6
roles/shell/tasks/packages.yml
View File

@ -77,6 +77,12 @@
- talkd
- finger
- fingerd
- analog
- inn2
- inn2-inews
- libconvert-binhex-perl
- libmime-tools-perl
- postfix
#Install python packages, when it's the latest
- name: Install pip packages

4
roles/shell/tasks/users/amcclure.yml
View File

@ -16,3 +16,7 @@
user: amcclure
state: present
key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhdNCqJ2+kTVRdf9R2g4Uv9TKuQzY4LbtJm5V1dx7uMfNI8HGHOa8gFopAaId8S9SY5WoIP4R0y+avZQzKRAVcqJNiKrKQDb5juLSWgL51CrOgZd6Y/nCUnvgmpAEUBzlxIBSDmiozDF4R6fk+8MqXsT8/HOaQgXX52v4qWBY9XWSOFwCeukywpnENvNm+H3vJhHddIYtcONWJB5m6msrBRo5NR7uo5RVt5GJpUpXfdI2IHLV4YZavLWiT/yBbBvxCODKWkNNXr9jBZ5RHPnqYcABoAKJ6hMaNzuJfAa9AvlV5aRDhRenOiS2/EQhC4rxPMHmnfn4TYng7vQRbVTvnGeLNGtsLqRDWuNQEmLYUZ8Q4JZfoSzZVmSyy2NeLvJRYxQRh7NTZlzoDkY+JBURINPcfVduVT2DD0buFSdhIq7/jreV1QZuSpOa5ABgvhTOf9bCIPaqbJ/zK7m+rqIPUhvrNZGgC7xkUpzdfl67W3xh+RyEIPdJX98dYZ9bZFFYvntW+plHizBBs+s7kGTV7BKm4rJ2oQfTby1M3++tSTZi/6QAkcOEb3VJ5n0rQiM+FMLuHfP2dPXh3AIVKYAiwZjdrJ3174g8JjSTXt3jJm6I1KW89oG2AcBbI/N3bgIVXcU+IRx846+zU7iZ49YtJK61Ml7u9aVQJDABQEMg6OQ== amcclure@triton"
- authorized_key:
user: amcclure
state: present
key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXMHswE3kzEpqFpPtbDNUW7oIECL7ZEyKe3mjsHl35OGI0HtOJUiTogk3ebDipkA/kYbVvzrWjztO8mMR0FctBKmaV0g6oQjnW3eIF6w5xy5B5uleNvLfI6pT9Wu+aUld7GwubgCEexlbOKUDg23krMh9nzP8l4XXcw3+Zai+lUA4rutNCx1CuoKFbc+EEYNLxp7nobib7lCkHSLvjmLaVTQwOCp6DF9qxr8NqfOPFErjEJLozTtJPv1redeC7V5gwrX1/u6Mo3EgAwyRTviOsOMTOkuCZzv2Y0k4VwhO+awgXOJVOJ+fdA5yR0dHV7JtZSXVvDpqVgQUEmLu0fx7L amcclure@summit"

2
roles/webserver/files/etc/apache2/sites-available/000-default.conf
View File

@ -9,7 +9,7 @@
#ServerName www.example.com
ServerAdmin amcclure@ttm.sh
DocumentRoot /var/www/html
DocumentRoot /var/www/thunix.cf
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.

11
roles/webserver/files/etc/apache2/sites-available/amcclure.ttm.sh.conf Normal file
View File

@ -0,0 +1,11 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName amcclure.ttm.sh
DocumentRoot /var/www/amcclure
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
<Directorymatch "^/.*/\.git/">
Order deny,allow
Deny from all
</Directorymatch>
</VirtualHost>

2
roles/webserver/files/etc/apache2/sites-available/default-ssl.conf
View File

@ -2,7 +2,7 @@
<VirtualHost _default_:443>
ServerAdmin amcclure@ttm.sh
DocumentRoot /var/www/html
DocumentRoot /var/www/thunix.cf
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
# error, crit, alert, emerg.

12
roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
View File

@ -1,12 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName ftp.summit.ttm.sh
DocumentRoot /var/www/summit/ftp
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
SSLCertificateFile /etc/letsencrypt/live/ftp.summit.ttm.sh/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/ftp.summit.ttm.sh/privkey.pem
Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>

7
roles/webserver/files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf
View File

@ -1,7 +0,0 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName ftp.summit.ttm.sh
DocumentRoot /var/www/summit/ftp
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>

9
roles/webserver/files/etc/apache2/sites-available/summit-nosite.conf
View File

@ -1,9 +0,0 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName server.summit.ttm.sh
ServerAlias *.summit.ttm.sh
DocumentRoot /var/www/html
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
Redirect 307 / http://www.summit.ttm.sh/
</VirtualHost>

12
roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
View File

@ -1,12 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName summit.ttm.sh
DocumentRoot /var/www/summit/redirect
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
SSLCertificateFile /etc/letsencrypt/live/summit.ttm.sh/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/summit.ttm.sh/privkey.pem
Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>

8
roles/webserver/files/etc/apache2/sites-available/summit.ttm.sh.conf
View File

@ -1,8 +0,0 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName summit.ttm.sh
# ServerAlias *.summit.ttm.sh
DocumentRoot /var/www/summit/redirect
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>

2
roles/webserver/files/etc/apache2/sites-available/thunix.cf-le-ssl.conf
View File

@ -2,7 +2,7 @@
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName thunix.cf
DocumentRoot /var/www/thunix/redirect
DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
SSLCertificateFile /etc/letsencrypt/live/thunix.cf/fullchain.pem

13
roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
View File

@ -1,13 +0,0 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName www.summit.ttm.sh
ServerAlias summit.ttm.sh
DocumentRoot /var/www/summit/www
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
SSLCertificateFile /etc/letsencrypt/live/www.summit.ttm.sh/fullchain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/www.summit.ttm.sh/privkey.pem
Include /etc/letsencrypt/options-ssl-apache.conf
</VirtualHost>
</IfModule>

8
roles/webserver/files/etc/apache2/sites-available/www.summit.ttm.sh.conf
View File

@ -1,8 +0,0 @@
<VirtualHost *:80>
ServerAdmin amcclure@ttm.sh
ServerName www.summit.ttm.sh
ServerAlias summit.ttm.sh
DocumentRoot /var/www/summit/www
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>

2
roles/webserver/files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
View File

@ -2,7 +2,7 @@
<VirtualHost *:443>
ServerAdmin amcclure@ttm.sh
ServerName www.thunix.cf
DocumentRoot /var/www/thunix/www
DocumentRoot /var/www/thunix.cf
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
SSLCertificateFile /etc/letsencrypt/live/www.thunix.cf/fullchain.pem

46
roles/webserver/tasks/apache.yml
View File

@ -10,16 +10,6 @@
src: ../files/etc/apache2/sites-available/default-ssl.conf
dest: /etc/apache2/sites-available/default-ssl.conf
- name: Deploy ftp.summit.ttm.sh.conf
copy:
src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh.conf
dest: /etc/apache2/sites-available/ftp.summit.ttm.sh.conf
#- name: Deploy ftp.summit.ttm.sh-le-ssl.conf
# copy:
# src: ../files/etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
# dest: /etc/apache2/sites-available/ftp.summit.ttm.sh-le-ssl.conf
- name: Deploy mail.thunix.cf.conf
copy:
src: ../files/etc/apache2/sites-available/mail.thunix.cf.conf
@ -35,21 +25,6 @@
src: ../files/etc/apache2/sites-available/ny.dyniform.net.conf
dest: /etc/apache2/sites-available/ny.dyniform.net.conf
- name: Deploy summit-nosite.conf
copy:
src: ../files/etc/apache2/sites-available/summit-nosite.conf
dest: /etc/apache2/sites-available/summit-nosite.conf
- name: Deploy summit.ttm.sh.conf
copy:
src: ../files/etc/apache2/sites-available/summit.ttm.sh.conf
dest: /etc/apache2/sites-available/summit.ttm.sh.conf
#- name: Deploy summit.ttm.sh-le-ssl.conf
# copy:
# src: ../files/etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
# dest: /etc/apache2/sites-available/summit.ttm.sh-le-ssl.conf
- name: Deploy thunix.cf.conf
copy:
src: ../files/etc/apache2/sites-available/thunix.cf.conf
@ -65,15 +40,10 @@
src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
dest: /etc/apache2/sites-available/thunix.tilde.chat.conf
- name: Deploy www.summit.ttm.sh.conf
copy:
src: ../files/etc/apache2/sites-available/www.summit.ttm.sh.conf
dest: /etc/apache2/sites-available/www.summit.ttm.sh.conf
#- name: Deploy www.summit.ttm.sh-le-ssl.conf
#- name: Deploy thunix.tilde.chat.conf
# copy:
# src: ../files/etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
# dest: /etc/apache2/sites-available/www.summit.ttm.sh-le-ssl.conf
# src: ../files/etc/apache2/sites-available/thunix.tilde.chat.conf
# dest: /etc/apache2/sites-available/thunix.tilde.chat.conf
- name: Deploy www.thunix.cf.conf
copy:
@ -84,3 +54,13 @@
# copy:
# src: ../files/etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
# dest: /etc/apache2/sites-available/www.thunix.cf-le-ssl.conf
- name: Deploy amcclure.ttm.sh.conf
copy:
src: ../files/etc/apache2/sites-available/amcclure.ttm.sh.conf
dest: /etc/apache2/sites-available/amcclure.ttm.sh.conf
#- name: Deploy amcclure.ttm.sh-le-ssl.conf
# copy:
# src: ../files/etc/apache2/sites-available/amcclure.ttm.sh-le-ssl.conf
# dest: /etc/apache2/sites-available/amcclure.ttm.sh-le-ssl.conf