Euh tout est bon pour forgehook?
This commit is contained in:
parent
a74ae14b48
commit
910479a37f
|
@ -9,7 +9,7 @@ peers:
|
||||||
packages:
|
packages:
|
||||||
debian: [ subversion, mercurial, htop, tmux, vim, emacs, mutt, weechat, elinks, rsync, dnsutils, make, g++, libssl-dev, mosh, gopher, sl ]
|
debian: [ subversion, mercurial, htop, tmux, vim, emacs, mutt, weechat, elinks, rsync, dnsutils, make, g++, libssl-dev, mosh, gopher, sl ]
|
||||||
rust: [ lsd ]
|
rust: [ lsd ]
|
||||||
custom: [ zola, ttbp ]
|
custom: [ zola, ttbp, forgehook ]
|
||||||
users:
|
users:
|
||||||
- name: tofu
|
- name: tofu
|
||||||
sudo: true
|
sudo: true
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
location /.well-known/forgehook {
|
||||||
|
alias /opt/forgehook/source/public;
|
||||||
|
index index.html index.php;
|
||||||
|
try_files $uri $uri/ /index.php;
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
include fastcgi.conf;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $request_filename;
|
||||||
|
fastcgi_pass unix:/opt/forgehook/php.sock;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1 @@
|
||||||
|
../webserver/handlers/
|
|
@ -17,7 +17,7 @@
|
||||||
shell:
|
shell:
|
||||||
chdir: /opt/forgehook/source
|
chdir: /opt/forgehook/source
|
||||||
cmd: bash setup.sh
|
cmd: bash setup.sh
|
||||||
when: repo_updated.changed
|
when: repo_update.changed
|
||||||
|
|
||||||
# TODO: Ici on présume très très fortement que webserver est activé et PHP installé -> mettre en place un vrai système d'interface entre rôles
|
# TODO: Ici on présume très très fortement que webserver est activé et PHP installé -> mettre en place un vrai système d'interface entre rôles
|
||||||
# TODO: Here we strongly assume webserver is enabled and PHP setup -> need a real interface/dependency system between roles
|
# TODO: Here we strongly assume webserver is enabled and PHP setup -> need a real interface/dependency system between roles
|
||||||
|
@ -27,24 +27,15 @@
|
||||||
src: ../../files/forgehook/php.conf
|
src: ../../files/forgehook/php.conf
|
||||||
dest: /etc/php/7.3/fpm/pool.d/forgehook.conf
|
dest: /etc/php/7.3/fpm/pool.d/forgehook.conf
|
||||||
notify: webserver-reload-php
|
notify: webserver-reload-php
|
||||||
failed_when: "webserver" not in roles
|
|
||||||
|
|
||||||
- name: custom-forgehook-endpoint
|
- name: custom-forgehook-endpoint
|
||||||
copy:
|
copy:
|
||||||
remote_src: yes
|
remote_src: yes
|
||||||
src: /opt/forgehook/source/endpoints/endpoint.php
|
src: /opt/forgehook/source/endpoints/index.php
|
||||||
dest: /opt/forgehook/source/public/index.php
|
dest: /opt/forgehook/source/public/index.php
|
||||||
|
|
||||||
- name: custom-forgehook-nginx
|
- name: custom-forgehook-nginx
|
||||||
blockinfile:
|
copy:
|
||||||
validate: nginx -t
|
src: ../../files/forgehook/nginx.conf
|
||||||
insertbefore: "location / {"
|
dest: /etc/nginx/conf.d/well-known/forgehook.conf
|
||||||
block: |
|
|
||||||
location /.well-known/forgehook {
|
|
||||||
include snippets/fastcgi-php.conf;
|
|
||||||
root /opt/forgehook/source/public;
|
|
||||||
try_files $uri $uri/ /index.php;
|
|
||||||
fastcgi_pass unix:/opt/forgehook/php.sock;
|
|
||||||
}
|
|
||||||
notify: webserver-reload-nginx
|
notify: webserver-reload-nginx
|
||||||
failed_when: "webserver" not in roles
|
|
||||||
|
|
|
@ -1,14 +1,3 @@
|
||||||
# Pour l'instant, il n'est pas possible d'avoir un paquet qui ne porte pas le nom de son binaire
|
|
||||||
# parce qu'on vérifie que le binaire est installé
|
|
||||||
# A terme, ça sera à chaque paquet de vérifier lui-même s'il est installé
|
|
||||||
|
|
||||||
# Vérifier quels paquets custom sont installés
|
|
||||||
- stat:
|
|
||||||
path: "/usr/local/bin/{{ item }}"
|
|
||||||
loop: "{{ packages.custom }}"
|
|
||||||
register: custom_exists
|
|
||||||
|
|
||||||
- name: "Installer les paquets custom activés dans la config"
|
- name: "Installer les paquets custom activés dans la config"
|
||||||
include: "{{ item.item }}/main.yml"
|
include: "{{ item }}/main.yml"
|
||||||
loop: "{{ custom_exists.results | default([]) }}"
|
loop: "{{ packages.custom }}"
|
||||||
when: not item.stat.exists
|
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
# Donc on copie un binaire que j'ai compilé avec amour
|
# Donc on copie un binaire que j'ai compilé avec amour
|
||||||
- name: custom-zola-setup
|
- name: custom-zola-setup
|
||||||
copy:
|
copy:
|
||||||
src: ../../files/bin/zola
|
src: ../../files/zola/zola
|
||||||
dest: /usr/local/bin/zola
|
dest: /usr/local/bin/zola
|
||||||
mode: 0755
|
mode: 0755
|
||||||
|
|
|
@ -31,6 +31,8 @@ server {
|
||||||
#try_files $2 $2/ = 404;
|
#try_files $2 $2/ = 404;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
include /etc/nginx/conf.d/well-known/*.conf;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ =404;
|
try_files $uri $uri/ =404;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
service: name=nginx state=restarted
|
service: name=nginx state=restarted
|
||||||
|
|
||||||
- name: webserver-reload-php
|
- name: webserver-reload-php
|
||||||
service: name=php-fpm state=restarted
|
service: name=php7.3-fpm state=restarted
|
||||||
|
|
|
@ -16,6 +16,11 @@
|
||||||
dest: /etc/nginx/conf.d/ssl.conf
|
dest: /etc/nginx/conf.d/ssl.conf
|
||||||
notify: webserver-reload-nginx
|
notify: webserver-reload-nginx
|
||||||
|
|
||||||
|
- name: TODO
|
||||||
|
file:
|
||||||
|
path: /etc/nginx/conf.d/well-known
|
||||||
|
state: directory
|
||||||
|
|
||||||
- name: webserver-personal-pages
|
- name: webserver-personal-pages
|
||||||
include: pages_perso.yml
|
include: pages_perso.yml
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue