diff --git a/.etckeeper b/.etckeeper index 376960b..968ae4e 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3369,6 +3369,9 @@ maybe chmod 0700 'nftables/osf' maybe chmod 0600 'nftables/osf/pf.os' maybe chmod 0600 'nftables/router.nft' maybe chmod 0755 'nginx' +maybe chown 'nginx' 'nginx/.anaf' +maybe chgrp 'nginx' 'nginx/.anaf' +maybe chmod 0640 'nginx/.anaf' maybe chown 'nginx' 'nginx/.htpasswd' maybe chgrp 'nginx' 'nginx/.htpasswd' maybe chmod 0640 'nginx/.htpasswd' @@ -3829,10 +3832,14 @@ maybe chmod 0644 'nginx/conf.d/mail.club3d.ro.conf' maybe chown 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/padmin.club3d.ro.conf' maybe chmod 0640 'nginx/conf.d/padmin.club3d.ro.conf' +maybe chown 'nginx' 'nginx/conf.d/php-fpm.conf' +maybe chgrp 'nginx' 'nginx/conf.d/php-fpm.conf' maybe chmod 0644 'nginx/conf.d/php-fpm.conf' maybe chown 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/rspamd.club3d.ro.conf' maybe chmod 0644 'nginx/conf.d/rspamd.club3d.ro.conf' +maybe chown 'nginx' 'nginx/conf.d/savu.conf' +maybe chgrp 'nginx' 'nginx/conf.d/savu.conf' maybe chmod 0640 'nginx/conf.d/savu.conf' maybe chown 'nginx' 'nginx/conf.d/storm.club3d.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/storm.club3d.ro.conf' diff --git a/group b/group index b91130d..9ef15a9 100644 --- a/group +++ b/group @@ -2,7 +2,7 @@ root:x:0: bin:x:1: daemon:x:2: sys:x:3: -adm:x:4: +adm:x:4:smiti tty:x:5: disk:x:6: lp:x:7: @@ -48,7 +48,7 @@ slocate:x:21: named:x:25: redis:x:987: memcached:x:986: -nginx:x:985:madalin +nginx:x:985:madalin,smiti apache:x:48: docker:x:984: cgred:x:983: diff --git a/group- b/group- index 40c2f7e..45c1e5b 100644 --- a/group- +++ b/group- @@ -48,7 +48,7 @@ slocate:x:21: named:x:25: redis:x:987: memcached:x:986: -nginx:x:985:madalin +nginx:x:985:madalin,smiti apache:x:48: docker:x:984: cgred:x:983: @@ -103,3 +103,4 @@ rundeck:x:1018: litecoin:x:1019: bogdan:x:1020: squid:x:23: +laser:x:1021: diff --git a/gshadow b/gshadow index 26a49a3..c08f62f 100644 --- a/gshadow +++ b/gshadow @@ -2,7 +2,7 @@ root::: bin::: daemon::: sys::: -adm::: +adm:::smiti tty::: disk::: lp::: @@ -48,7 +48,7 @@ slocate:!:: named:!:: redis:!:: memcached:!:: -nginx:!::madalin +nginx:!::madalin,smiti apache:!:: docker:!:: cgred:!:: diff --git a/gshadow- b/gshadow- index 9aa2961..6e42661 100644 --- a/gshadow- +++ b/gshadow- @@ -48,7 +48,7 @@ slocate:!:: named:!:: redis:!:: memcached:!:: -nginx:!::madalin +nginx:!::madalin,smiti apache:!:: docker:!:: cgred:!:: @@ -103,3 +103,4 @@ rundeck:!:: litecoin:!:: bogdan:!:: squid:!:: +laser:!:: diff --git a/nginx/.anaf b/nginx/.anaf new file mode 100644 index 0000000..819b555 --- /dev/null +++ b/nginx/.anaf @@ -0,0 +1 @@ +nina:$apr1$mUstGlC/$R4XSJiY3mmqNS92xpDfm2/ diff --git a/nginx/conf.d/club3d.ro.conf b/nginx/conf.d/club3d.ro.conf index 686e8c9..ecce0b2 100644 --- a/nginx/conf.d/club3d.ro.conf +++ b/nginx/conf.d/club3d.ro.conf @@ -35,6 +35,11 @@ server { auth_basic_user_file /etc/nginx/.htpasswd; } + location /anaf { + auth_basic "Private"; + auth_basic_user_file /etc/nginx/.anaf; + } + listen 192.168.1.2:443 ssl http2; # managed by Certbot ssl_certificate /etc/letsencrypt/live/club3d.ro-0001/fullchain.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/club3d.ro-0001/privkey.pem; # managed by Certbot diff --git a/nginx/conf.d/git.898.ro.conf b/nginx/conf.d/git.898.ro.conf index 8bf0858..36bdc18 100644 --- a/nginx/conf.d/git.898.ro.conf +++ b/nginx/conf.d/git.898.ro.conf @@ -1,5 +1,6 @@ server { listen 192.168.1.2:80; + server_name git.898.ro; listen 192.168.1.2:443 ssl; # managed by Certbot ssl_certificate /etc/letsencrypt/live/git.898.ro/fullchain.pem; # managed by Certbot @@ -14,10 +15,14 @@ server { return 301 https://$host$request_uri; } # managed by Certbot - server_name git.898.ro; - location / { - proxy_pass http://192.168.1.5:4000/; + proxy_pass https://mail.898.ro/gitea; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + } + + location /gitea { + proxy_pass https://mail.898.ro/gitea; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; } diff --git a/shadow b/shadow index f950e17..8851cfb 100644 --- a/shadow +++ b/shadow @@ -58,7 +58,7 @@ ossecr:!!:18591:::::: ossecm:!!:18591:::::: ossece:!!:18591:::::: csf:!!:18595:0:99999:7::: -smiti:$6$PEl7gUlGcX5kUoUg$SV1jPhc61CYd7iBb.S.6YT3RhMvZp26KKXx9T9UODasYG9cT5P3wGvbH6uAJusdZcXiaDaHsgYsWnQzWH051g1:18599:0:99999:7::: +smiti:$6$lBK9J/AHYEr19bRw$GLsXaSOplBlRaGWdXWNKurJHouftuoP1rpfsNKcV1o6vHKLJkVnwhesugE/5OKGVMS20WladJHlyO0FKpTIGo1:19026:0:99999:7::: pesign:!!:18631:::::: sqlgrey:x:18638:0:99999:7::: vmail:x:18638:0:99999:7:::