diff --git a/README.md b/README.md index 3a41858..391fad7 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,9 @@ Playbooks pour installation via Ansible de services pour le Fuz. ## Deployment 1. Récupérer l'inventaire `hosts.ini` auprès d'un humain ou autre -2. Install ansible: +2. Installer ansible: ```bash - sudo apt update - sudo apt install software-properties-common - sudo apt-add-repository --yes --update ppa:ansible/ansible - sudo apt install ansible + sudo pip3 install ansible ``` -1. Launch the playbook: `ansible-playbook main.yml -K --check` \ No newline at end of file +1. Launch the playbook sans faire de changements: `ansible-playbook main.yml -K --check --diff -vv` \ No newline at end of file diff --git a/adminsys-classique.yml b/adminsys-classique.yml index 2cd3fbe..8c7536b 100644 --- a/adminsys-classique.yml +++ b/adminsys-classique.yml @@ -14,4 +14,6 @@ - python3-pip - tmux - bash-completion + - rsync + - unattended-upgrades # - zsh \ No newline at end of file diff --git a/ansible-pull-cron.yml b/ansible-pull-cron.yml deleted file mode 100644 index b855cb4..0000000 --- a/ansible-pull-cron.yml +++ /dev/null @@ -1 +0,0 @@ -# Configure crontab of ansible pull to this repo to create a puppet-like kind of config \ No newline at end of file diff --git a/files/nginx/sites-enabled/fuz.re.conf b/files/nginx/sites-enabled/fuz.re.conf index 1721eec..7b8a063 100755 --- a/files/nginx/sites-enabled/fuz.re.conf +++ b/files/nginx/sites-enabled/fuz.re.conf @@ -30,7 +30,7 @@ server { server { listen 443 ssl http2; listen [::]:443 ssl http2; - server_name *.fuz.re; + server_name fuz.re www.fuz.re; # SSL ssl_certificate /etc/letsencrypt/live/fuz.re/fullchain.pem; @@ -43,7 +43,7 @@ server { server { listen 80; listen [::]:80; - server_name .fuz.re; + server_name fuz.re www.fuz.re; include snippets/letsencrypt.conf; location / { diff --git a/matrix.yml b/matrix.yml index f2a8d9a..62e9ca9 100644 --- a/matrix.yml +++ b/matrix.yml @@ -5,7 +5,8 @@ apt: name: matrix-synapse update_cache: yes - - template: + - name: Config Synapse conforme à ce qu'il y a dans ce dépôt Ansible + template: src: templates/homeserver.yaml.j2 dest: /etc/matrix-synapse/homeserver.yaml vars: diff --git a/site-statique.yml b/site-statique.yml index 94df68e..7c70acd 100644 --- a/site-statique.yml +++ b/site-statique.yml @@ -1 +1,10 @@ -# lighttpd ou nginx ? \ No newline at end of file +- hosts: octo.fuz.re + tasks: + - apt: Nginx installé + name: nginx + + - name: On charge Nginx + service: + name: nginx + state: started + enabled: enabled \ No newline at end of file