From 747d9666ce0b84d4988f52aaef633311ccb140be Mon Sep 17 00:00:00 2001 From: bms8197 Date: Tue, 26 Apr 2022 13:32:47 +0300 Subject: [PATCH] saving uncommitted changes in /etc prior to dnf run --- .etckeeper | 2 + csf/csf.ignore | 2 +- csf/csf.pignore | 3 ++ group | 1 + group- | 2 +- gshadow | 1 + gshadow- | 4 +- nginx/conf.d/files.898.ro.conf | 51 +++++++++---------- nginx/conf.d/files.898.ro.conf_ | 34 +++++++++++++ passwd | 1 + passwd- | 1 - profile.d/cells-env.sh | 2 + shadow | 1 + shadow- | 1 - subgid | 1 + subgid- | 1 - subuid | 1 + subuid- | 1 - .../multi-user.target.wants/pydio.service | 1 + 19 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 nginx/conf.d/files.898.ro.conf_ create mode 100755 profile.d/cells-env.sh create mode 120000 systemd/system/multi-user.target.wants/pydio.service diff --git a/.etckeeper b/.etckeeper index 6e6dc93..e0717d6 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3512,6 +3512,7 @@ maybe chmod 0644 'nginx/conf.d/default.conf.rpmnew' maybe chown 'nginx' 'nginx/conf.d/files.898.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/files.898.ro.conf' maybe chmod 0640 'nginx/conf.d/files.898.ro.conf' +maybe chmod 0640 'nginx/conf.d/files.898.ro.conf_' maybe chown 'nginx' 'nginx/conf.d/fl.898.ro.conf' maybe chgrp 'nginx' 'nginx/conf.d/fl.898.ro.conf' maybe chmod 0640 'nginx/conf.d/fl.898.ro.conf' @@ -4545,6 +4546,7 @@ maybe chmod 0644 'printcap' maybe chmod 0644 'profile' maybe chmod 0755 'profile.d' maybe chmod 0644 'profile.d/bash_completion.sh' +maybe chmod 0755 'profile.d/cells-env.sh' maybe chmod 0644 'profile.d/colorgrep.csh' maybe chmod 0644 'profile.d/colorgrep.sh' maybe chmod 0644 'profile.d/colorls.csh' diff --git a/csf/csf.ignore b/csf/csf.ignore index 4cea01a..4bf8c74 100644 --- a/csf/csf.ignore +++ b/csf/csf.ignore @@ -26,4 +26,4 @@ 188.25.218.186 86.126.20.95 86.126.27.87 -;; connection timed out; no servers could be reached +86.127.4.94 diff --git a/csf/csf.pignore b/csf/csf.pignore index 7a0420e..538bad7 100644 --- a/csf/csf.pignore +++ b/csf/csf.pignore @@ -171,3 +171,6 @@ exe:/usr/sbin/squid user:squid +user:pydio +exe:/home/pydio/cells + diff --git a/group b/group index 6e60590..031f797 100644 --- a/group +++ b/group @@ -104,3 +104,4 @@ litecoin:x:1019: bogdan:x:1020: squid:x:23: laser:x:1021: +pydio:x:1022: diff --git a/group- b/group- index 45c1e5b..6e60590 100644 --- a/group- +++ b/group- @@ -8,7 +8,7 @@ disk:x:6: lp:x:7: mem:x:8: kmem:x:9: -wheel:x:10:vampi +wheel:x:10:vampi,smiti cdrom:x:11: mail:x:12:postfix,opendkim,opendmarc man:x:15: diff --git a/gshadow b/gshadow index 892e09f..81e07e7 100644 --- a/gshadow +++ b/gshadow @@ -104,3 +104,4 @@ litecoin:!:: bogdan:!:: squid:!:: laser:!:: +pydio:!:: diff --git a/gshadow- b/gshadow- index c08f62f..892e09f 100644 --- a/gshadow- +++ b/gshadow- @@ -2,13 +2,13 @@ root::: bin::: daemon::: sys::: -adm:::smiti +adm::: tty::: disk::: lp::: mem::: kmem::: -wheel:::vampi +wheel:::vampi,smiti cdrom::: mail:::postfix,opendkim,opendmarc man::: diff --git a/nginx/conf.d/files.898.ro.conf b/nginx/conf.d/files.898.ro.conf index 8789167..1f9808b 100644 --- a/nginx/conf.d/files.898.ro.conf +++ b/nginx/conf.d/files.898.ro.conf @@ -1,34 +1,33 @@ server { - listen 192.168.1.2:80; - server_name files.898.ro; - charset utf-8; - root /var/www/html/afiles; - index index.php index.html index.htm; + listen 192.168.1.2:80; + server_name files.898.ro; + charset utf-8; + root /var/www/html/afiles; + index index.php index.html index.htm; - access_log /var/log/nginx/files.898.ro.access.log; - error_log /var/log/nginx/files.898.ro.error.log; + access_log /var/log/nginx/files.898.ro.access.log; + error_log /var/log/nginx/files.898.ro.error.log; - location ~* \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include fastcgi_params; - fastcgi_pass unix:/var/run/php-fpm.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_buffer_size 16k; - fastcgi_buffers 4 16k; - } + # gzip should not be used with SSL + gzip off; - # gzip should not be used with SSL - gzip off; + listen 192.168.1.2:443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/files.898.ro/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/files.898.ro/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - listen 192.168.1.2:443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/files.898.ro/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/files.898.ro/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + location / { + proxy_pass https://localhost:8011; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header Host $host; + } - ### redirect - if ($scheme != "https") { - return 301 https://$host$request_uri; - } # managed by Certbot + ### redirect + if ($scheme != "https") { + return 301 https://$host$request_uri; + } # managed by Certbot } + diff --git a/nginx/conf.d/files.898.ro.conf_ b/nginx/conf.d/files.898.ro.conf_ new file mode 100644 index 0000000..8789167 --- /dev/null +++ b/nginx/conf.d/files.898.ro.conf_ @@ -0,0 +1,34 @@ +server { + listen 192.168.1.2:80; + server_name files.898.ro; + charset utf-8; + root /var/www/html/afiles; + index index.php index.html index.htm; + + access_log /var/log/nginx/files.898.ro.access.log; + error_log /var/log/nginx/files.898.ro.error.log; + + location ~* \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + include fastcgi_params; + fastcgi_pass unix:/var/run/php-fpm.sock; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + } + + # gzip should not be used with SSL + gzip off; + + listen 192.168.1.2:443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/files.898.ro/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/files.898.ro/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + + ### redirect + if ($scheme != "https") { + return 301 https://$host$request_uri; + } # managed by Certbot + +} diff --git a/passwd b/passwd index d420377..5d2c175 100644 --- a/passwd +++ b/passwd @@ -75,3 +75,4 @@ litecoin:x:1018:1019::/opt/litecoin:/bin/bash bogdan:x:1019:1020::/home/bogdan:/bin/bash squid:x:23:23::/var/spool/squid:/sbin/nologin laser:x:1020:1021::/home/laser:/bin/bash +pydio:x:1021:1022::/home/pydio:/bin/bash diff --git a/passwd- b/passwd- index c2c8606..d420377 100644 --- a/passwd- +++ b/passwd- @@ -75,4 +75,3 @@ litecoin:x:1018:1019::/opt/litecoin:/bin/bash bogdan:x:1019:1020::/home/bogdan:/bin/bash squid:x:23:23::/var/spool/squid:/sbin/nologin laser:x:1020:1021::/home/laser:/bin/bash -bogdan.tanase:x:1021:1022::/home/bogdan.tanase:/bin/bash diff --git a/profile.d/cells-env.sh b/profile.d/cells-env.sh new file mode 100755 index 0000000..ba4ed47 --- /dev/null +++ b/profile.d/cells-env.sh @@ -0,0 +1,2 @@ +export CELLS_WORKING_DIR=/var/cells +export CADDYPATH=/var/cells/certs diff --git a/shadow b/shadow index 8851cfb..e5f8e82 100644 --- a/shadow +++ b/shadow @@ -75,3 +75,4 @@ litecoin:!!:18775:0:99999:7:30:: bogdan:mCxaxi7Ck2FlI:18822:0:99999:7:30:: squid:!!:18921:::::: laser:$6$3IDnJkLhNhDa5MUg$ysajgR6P3uElTVSBuLJbix4lHHNheJ.JBIrGFRvUPsY2/265PmO3vjgWTculxKkywvas0vcVrX3Q4QQZ/qufR.:18954:0:99999:7:30:: +pydio:!!:19102:0:99999:7:30:: diff --git a/shadow- b/shadow- index da2ef06..8851cfb 100644 --- a/shadow- +++ b/shadow- @@ -75,4 +75,3 @@ litecoin:!!:18775:0:99999:7:30:: bogdan:mCxaxi7Ck2FlI:18822:0:99999:7:30:: squid:!!:18921:::::: laser:$6$3IDnJkLhNhDa5MUg$ysajgR6P3uElTVSBuLJbix4lHHNheJ.JBIrGFRvUPsY2/265PmO3vjgWTculxKkywvas0vcVrX3Q4QQZ/qufR.:18954:0:99999:7:30:: -bogdan.tanase:$6$.D9RFOAxWofAzule$JHgjoXa3paOjNdItuWLfYODTP.Tp.q5tiHEdDvkCD4A4f/e2A.taqRf1wQiW/PpWIoVpKoFLPvz55TkUgwIfq0:19054:0:99999:7:30:: diff --git a/subgid b/subgid index 18ce69d..7becd61 100644 --- a/subgid +++ b/subgid @@ -18,3 +18,4 @@ rundeck:1148576:65536 litecoin:1214112:65536 bogdan:1279648:65536 laser:1345184:65536 +pydio:1410720:65536 diff --git a/subgid- b/subgid- index 72bfab5..18ce69d 100644 --- a/subgid- +++ b/subgid- @@ -18,4 +18,3 @@ rundeck:1148576:65536 litecoin:1214112:65536 bogdan:1279648:65536 laser:1345184:65536 -bogdan.tanase:1410720:65536 diff --git a/subuid b/subuid index 18ce69d..7becd61 100644 --- a/subuid +++ b/subuid @@ -18,3 +18,4 @@ rundeck:1148576:65536 litecoin:1214112:65536 bogdan:1279648:65536 laser:1345184:65536 +pydio:1410720:65536 diff --git a/subuid- b/subuid- index 72bfab5..18ce69d 100644 --- a/subuid- +++ b/subuid- @@ -18,4 +18,3 @@ rundeck:1148576:65536 litecoin:1214112:65536 bogdan:1279648:65536 laser:1345184:65536 -bogdan.tanase:1410720:65536 diff --git a/systemd/system/multi-user.target.wants/pydio.service b/systemd/system/multi-user.target.wants/pydio.service new file mode 120000 index 0000000..bbb4913 --- /dev/null +++ b/systemd/system/multi-user.target.wants/pydio.service @@ -0,0 +1 @@ +/etc/systemd/system/pydio.service \ No newline at end of file