Skip to content

Commit

Permalink
aguia-pescadora-bravo (#16), mvp-userdir (#35): HTTPS para usuarios (…
Browse files Browse the repository at this point in the history
…não inclui dominios com balanço de carga)
  • Loading branch information
fititnt committed May 24, 2019
1 parent 9fab9aa commit 17bee01
Show file tree
Hide file tree
Showing 8 changed files with 114 additions and 42 deletions.
46 changes: 43 additions & 3 deletions logbook/aguia-pescadora-bravo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,35 @@ sudo usermod -aG sudo fititnt
curl http://fititnt.apb.etica.ai
curl http://fititnt.lb-ap.etica.ai

# Aviso: descrição da razão dessaes passos esta em usuariodeteste
sudo mkdir /home2/fititnt
sudo chown fititnt:fititnt /home2/fititnt
sudo chmod 751 /home2/fititnt

sudo usermod -a -G www-data fititnt

sudo -u fititnt mkdir /home2/fititnt/web
sudo -u fititnt mkdir /home2/fititnt/web/public_html
sudo -u fititnt mkdir /home2/fititnt/web/public_api
sudo -u fititnt mkdir /home2/fititnt/web/public_php

sudo -u fititnt echo "fititnt <br>Servidor comunitario: http://aguia-pescadora-bravo.etica.ai <br>Arquivo: /home2/fititnt/web/public_html/index.html" > /home2/fititnt/web/public_html/index.html
sudo -u fititnt echo "fititnt <br>Servidor comunitario: http://aguia-pescadora-bravo.etica.ai <br>Arquivo: /home2/fititnt/web/public_php/index.php <br><?php phpinfo(); ?>" > /home2/fititnt/web/public_php/index.php

sudo cp /etc/nginx/sites-available/EXEMPLO-USUARIO.abp.etica.ai.conf /etc/nginx/sites-available/fititnt.apb.etica.ai.conf

sudo vim /etc/nginx/sites-available/fititnt.apb.etica.ai.conf
# Adicione todas as customizacoes deste usuario no arquivo acima...

sudo ln -s /etc/nginx/sites-available/fititnt.apb.etica.ai.conf /etc/nginx/sites-enabled/
sudo nginx -t
sudo systemctl reload nginx

sudo certbot --nginx -d fititnt.apb.etica.ai
# Nota: neste site escolhido redirecionar todo trafico HTTP para HTTPS

sudo chown fititnt:fititnt -R /home2/fititnt

### loopchaves -----------------------------------------------------------------
sudo adduser loopchaves
sudo passwd -e loopchaves
Expand Down Expand Up @@ -388,6 +417,8 @@ sudo ln -s /etc/nginx/sites-available/loopchaves.apb.etica.ai.conf /etc/nginx/si
sudo nginx -t
sudo systemctl reload nginx

sudo certbot --nginx -d loopchaves.apb.etica.ai

sudo chown loopchaves:loopchaves -R /home2/loopchaves

### usuariodeteste -------------------------------------------------------------
Expand All @@ -412,20 +443,29 @@ sudo mkdir /home2/usuariodeteste/web/public_api
sudo echo "usuariodeteste <br>Servidor comunitario: http://aguia-pescadora-bravo.etica.ai <br>Arquivo: /home2/usuariodeteste/web/public_html/index.html" > /home2/usuariodeteste/web/public_html/index.html
sudo chown usuariodeteste:usuariodeteste /home2/usuariodeteste/web/public_html/index.html

sudo vim /etc/nginx/sites-available/usuarioteste.apb.etica.ai.conf
sudo vim /etc/nginx/sites-available/usuariodeteste.apb.etica.ai.conf
# Adicione todas as customizacoes deste usuario no arquivo acima...

sudo ln -s /etc/nginx/sites-available/usuarioteste.apb.etica.ai.conf /etc/nginx/sites-enabled/
sudo ln -s /etc/nginx/sites-available/usuariodeteste.apb.etica.ai.conf /etc/nginx/sites-enabled/

sudo nginx -t
# Se o comando acima falhar:
# sudo rm /etc/nginx/sites-enabled/usuarioteste.apb.etica.ai.conf
# sudo rm /etc/nginx/sites-enabled/usuariodeteste.apb.etica.ai.conf
# Se ele não falhou, de reload no NGinx
sudo systemctl reload nginx

# Corrige permissões que por acaso tenham ficado para tras
sudo chown usuariodeteste:usuariodeteste -R /home2/usuariodeteste

## Dominios customizados de usuariodeteste (já adicionados na CloudFlare)
curl http://usuariodeteste.apb.etica.ai
curl http://usuariodeteste.lb-ap.etica.ai

## Certificado HTTPS para usuariodeteste
# Linha de comando para obter certificados. Automaticamente já edita configurações do NGinx
# Nota: o subdominio de lb-ap via HTTPS ainda não sera adicionado, veja https://github.com/fititnt/cplp-aiops/issues/35#issuecomment-495508373
sudo certbot --nginx -d usuariodeteste.apb.etica.ai

#------------------------------------------------------------------------------#
# SEÇÃO 1.1: USUÁRIOS DO SISTEMA - MENSAGENS INFORMATIVAS #
# #
Expand Down
10 changes: 1 addition & 9 deletions logbook/aguia-pescadora-bravo/etc/nginx/sites-available/default
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ server {

server_name _;

# Inclui nossa funcionalidade de diretorios de usuarios
# disponibilizada em /etc/nginx/snippets/userdir.conf
include snippets/userdir.conf;

location / {
# First attempt to serve request as file, then
# as directory, then fall back to displaying a 404.
Expand Down Expand Up @@ -120,10 +116,6 @@ server {
index index.html index.htm index.nginx-debian.html;
server_name apb.etica.ai aguia-pescadora-bravo.etica.ai; # managed by Certbot

# Inclui nossa funcionalidade de diretorios de usuarios
# disponibilizada em /etc/nginx/snippets/userdir.conf
include snippets/userdir.conf;

location / {
# First attempt to serve request as file, then
# as directory, then fall back to displaying a 404.
Expand Down Expand Up @@ -158,4 +150,4 @@ server {



}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# FILE: /etc/nginx/sites-available/fititnt.apb.etica.ai.conf

server {
root /home2/fititnt/web/public_html;

index index.html;

server_name fititnt.apb.etica.ai fititnt.lb-ap.etica.ai;

location / {
try_files $uri $uri/ =404;
}

listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/fititnt.apb.etica.ai/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/fititnt.apb.etica.ai/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

}

server {
if ($host = fititnt.apb.etica.ai) {
return 301 https://$host$request_uri;
} # managed by Certbot



listen 80;
listen [::]:80;

server_name fititnt.apb.etica.ai fititnt.lb-ap.etica.ai;
return 404; # managed by Certbot


}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,12 @@ server {
location / {
try_files $uri $uri/ =404;
}

listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/loopchaves.apb.etica.ai/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/loopchaves.apb.etica.ai/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

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ server {

# Serve conteudo de, por exemplo,
# http://usuario.apb.etica.ai/~usuariodeteste
# para conte�do de
# para conteúdo de
# /home2/usuariodeteste/web/public_html
location ~ ^/~(.+?)(/.*)?$ {
alias /home2/$1/web/public_html$2;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# FILE: /etc/nginx/sites-available/usuariodeteste.apb.etica.ai.conf

server {

listen 80;
listen [::]:80;
root /home2/usuariodeteste/web/public_html;

index index.html;

server_name usuariodeteste.apb.etica.ai usuariodeteste.lb-ap.etica.ai;

location / {
try_files $uri $uri/ =404;
}

listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/usuariodeteste.apb.etica.ai/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/usuariodeteste.apb.etica.ai/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

}

This file was deleted.

13 changes: 0 additions & 13 deletions logbook/aguia-pescadora-bravo/etc/nginx/snippets/userdir.conf

This file was deleted.

0 comments on commit 17bee01

Please sign in to comment.