diff --git a/inventory/host_vars/vps-host b/inventory/host_vars/vps-host index abbef62..793ffea 100644 --- a/inventory/host_vars/vps-host +++ b/inventory/host_vars/vps-host @@ -1,13 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -33646437393365646539336536336139353434326631616266313131326363666133326365386135 -3730326363313064353737623638396362373864343539650a323763333831613762313361366261 -63343630306135663463343430396537633665363335646135633030316266366561393436663565 -3034333636353864360a623139646463316465646335623561373234373138346332383735623664 -62663866343963666633643866376137613135373236663134323835636466643530656132323632 -36643964396437313030613436656538623663613663303762656665346162613063373861343334 -32646630366630333339626261363665373461353135386563393632376234366566306466633164 -34306434623263633331623732323266343035323730653039303439333635343234653536306263 -34303765333365623866656164663832393631653063393339646338333261663863313738613137 -36353532616434353333393639636135616165333630303265356438303961363464396532316632 -37636364666130366533363664646531613538313034653662613636323939396461626430363764 -35366165306233303830 +37656337323032643834333437363330363932363462306332646166616531616265646536373530 +6234313633353137656665653536663964393264303532610a633664613332343333363034396238 +61643465363532383661636238356566616161343034343166656364353538353564333235373663 +3336313930643062370a316439666335626265306338383939306433343439666333646632613366 +65663766326333623033643933613962393163313566636238353964656636633265373936626364 +65313565663265613532623563366533393030643539346363613035656632323762666131643530 +61616338616637336333663363323761653564633137633361333364663232656136353966346134 +38313435653131326161383564386261356333356164393034663538326262633036383438666330 +65393939363338363932653461393234346431653661626338653536353562396664313932346432 +39353035373263633938336337346461306162656662363461306538353436353063363764323631 +30386334356534663238656166666432636233353935623331366130323264393231306265363761 +37323163663561393938366662373963303634636564346663363239346332316336366636636235 +64343466333931353861346164656234393265653034623335636266393262323234 diff --git a/roles/deploy-web/files/gouter b/roles/deploy-web/files/gouter new file mode 100644 index 0000000..e8b8000 --- /dev/null +++ b/roles/deploy-web/files/gouter @@ -0,0 +1,132 @@ +## +# You should look at the following URL's in order to grasp a solid understanding +# of Nginx configuration files in order to fully unleash the power of Nginx. +# https://www.nginx.com/resources/wiki/start/ +# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/ +# https://wiki.debian.org/Nginx/DirectoryStructure +# +# In most cases, administrators will remove this file from sites-enabled/ and +# leave it as reference inside of sites-available where it will continue to be +# updated by the nginx packaging team. +# +# This file will automatically load configuration files provided by other +# applications, such as Drupal or Wordpress. These applications will be made +# available underneath a path with that package name, such as /drupal8. +# +# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples. +## + +# Default server configuration +# +server { + + # SSL configuration + # + # listen 443 ssl default_server; + # listen [::]:443 ssl default_server; + # + # Note: You should disable gzip for SSL traffic. + # See: https://bugs.debian.org/773332 + # + # Read up on ssl_ciphers to ensure a secure configuration. + # See: https://bugs.debian.org/765782 + # + # Self signed certs generated by the ssl-cert package + # Don't use them in a production server! + # + # include snippets/snakeoil.conf; + + #root /var/www/html; + + # Add index.php to the list if you are using PHP + #index index.html index.htm index.nginx-debian.html; + #gzip_static off; + server_name gouters.valczeryba.ovh; + add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; + proxy_cache STATIC; + location / { + # First attempt to serve request as file, then + # as directory, then fall back to displaying a 404. + #try_files $uri $uri/ =404; + proxy_set_header Accept-Encoding ""; + proxy_pass http://gouters.canalblog.com/; + #proxy_redirect off; + #proxy_set_header Host $host; + #proxy_buffering on; + #proxy_cache STATIC; + proxy_cache_key $scheme://$host$uri$is_args$query_string; + proxy_cache_valid 200 10m; + proxy_cache_lock on; + proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; + #proxy_ssl_verify off; + #proxy_set_header X-Real-IP $remote_addr; + #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + #proxy_set_header X-Forwarded-Proto $scheme; + sub_filter 'gouters.canalblog.com' 'gouters.valczeryba.ovh'; + sub_filter_once off; + + + } + + # pass PHP scripts to FastCGI server + # + #location ~ \.php$ { + # include snippets/fastcgi-php.conf; + # + # # With php-fpm (or other unix sockets): + # fastcgi_pass unix:/run/php/php7.3-fpm.sock; + # # With php-cgi (or other tcp sockets): + # fastcgi_pass 127.0.0.1:9000; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/gouters.valczeryba.ovh/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/gouters.valczeryba.ovh/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + + + +} + + +# Virtual Host configuration for example.com +# +# You can move that to a different file under sites-available/ and symlink that +# to sites-enabled/ to enable it. +# +#server { +# listen 80; +# listen [::]:80; +# +# server_name example.com; +# +# root /var/www/example.com; +# index index.html; +# +# location / { +# try_files $uri $uri/ =404; +# } +#} + +server { + if ($host = gouters.valczeryba.ovh) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + + server_name gouters.valczeryba.ovh; + listen 80; + return 404; # managed by Certbot + + +} diff --git a/roles/deploy-web/tasks/deploy.yml b/roles/deploy-web/tasks/deploy.yml index 29014c8..48ce25d 100644 --- a/roles/deploy-web/tasks/deploy.yml +++ b/roles/deploy-web/tasks/deploy.yml @@ -5,7 +5,7 @@ module: git repo: "https://{{ git_username | urlencode }}:{{ git_password | urlencode }}@git.valczeryba.ovh/v4l3n71n/{{ item.git_name }}.git" dest: "/home/valentin/src/" - archive: "/tmp/{{ item.name }}.tar.gz" + archive: "/tmp/{{ item.git_name }}.tar.gz" force: yes update: yes when: "item.git_name is defined" @@ -13,7 +13,6 @@ - "{{ project }}" - - name: "Create directory " file: path: "/var/www/{{ item.git_name }}" @@ -44,3 +43,38 @@ ansible_become: yes ansible_become_method: sudo ansible_become_password: "{{ sudo_password }}" + +- name: "Copy configure nginx" + copy: + src: "{{ item.conf_name }}" + dest: "/etc/nginx/sites-available" + when: "item.conf_name is defined" + with_items: + - "{{ project }}" + vars: + ansible_become: yes + ansible_become_method: sudo + ansible_become_password: "{{ sudo_password }}" + + +- name: "Create symlink" + file: + src: "/etc/nginx/sites-available/{{ item.conf_name }}" + dest: "/etc/nginx/sites-enabled/{{ item.conf_name }}" + state: link + when: "item.conf_name is defined" + with_items: + - "{{ project }}" + vars: + ansible_become: yes + ansible_become_method: sudo + ansible_become_password: "{{ sudo_password }}" + +- name: restart nginx + service: + name: nginx + state: restarted + vars: + ansible_become: yes + ansible_become_method: sudo + ansible_become_password: "{{ sudo_password }}" \ No newline at end of file