diff --git a/.etckeeper b/.etckeeper index 344c434..ffe24e2 100755 --- a/.etckeeper +++ b/.etckeeper @@ -3778,6 +3778,7 @@ maybe chmod 0640 'nginx/sites-available/erp.juedt.law' maybe chown 'nginx' 'nginx/sites-available/jsmal.co' maybe chgrp 'nginx' 'nginx/sites-available/jsmal.co' maybe chmod 0640 'nginx/sites-available/jsmal.co' +maybe chmod 0640 'nginx/sites-available/microscope.com' maybe chown 'nginx' 'nginx/sites-available/odoo.club3d.ro' maybe chgrp 'nginx' 'nginx/sites-available/odoo.club3d.ro' maybe chmod 0640 'nginx/sites-available/odoo.club3d.ro' diff --git a/csf/changelog.txt b/csf/changelog.txt index d7ddbbe..ec9c941 100644 --- a/csf/changelog.txt +++ b/csf/changelog.txt @@ -1,5 +1,17 @@ ChangeLog: +14.11 - Added entries in csf.pignore for new cPanel installations: + exe:/usr/sbin/mariadbd + exe:/usr/sbin/atd + exe:/usr/lib/systemd/systemd-timesyncd + exe:/usr/lib/systemd/systemd-networkd + exe:/usr/sbin/rsyslogd + + Updated configuration files to support cPanel on Ubuntu + + In Server Check don't check for Fork Bomb protection on cPanel servers + running CloudLinux + 14.10 - Fixed error message regarding location/permissions to the iptables binary in correctly referencing ip6tables diff --git a/csf/install.txt b/csf/install.txt index adb0e12..147fc3f 100644 --- a/csf/install.txt +++ b/csf/install.txt @@ -55,7 +55,7 @@ While most should be installed on a standard perl installation the following may need to be installed manually: # On rpm based systems: -yum install perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph +yum install perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph perl-Math-BigInt.noarch # On APT based systems: apt-get install libwww-perl liblwp-protocol-https-perl libgd-graph-perl diff --git a/csf/version.txt b/csf/version.txt index d3a61db..eab8122 100644 --- a/csf/version.txt +++ b/csf/version.txt @@ -1 +1 @@ -14.10 \ No newline at end of file +14.11 \ No newline at end of file diff --git a/hosts b/hosts index 09c070d..eaec750 100644 --- a/hosts +++ b/hosts @@ -3,7 +3,7 @@ ### 192.168.1.2 linux.vrem.ro linux 192.168.1.1 speedport.lan -192.168.1.3 backup.lan backup +192.168.1.4 backup.lan backup 192.168.1.5 mail.898.ro mail 192.168.1.21 pi.lan pi.acasa pi 192.168.1.254 virt.acasa virt diff --git a/logrotate.conf b/logrotate.conf index 742e0d4..a9dd3e4 100644 --- a/logrotate.conf +++ b/logrotate.conf @@ -6,7 +6,7 @@ weekly rotate 4 # create new (empty) log files after rotating old ones -create +create 0640 root utmp # use date as a suffix of the rotated file dateext diff --git a/nginx/sites-available/microscope.com b/nginx/sites-available/microscope.com new file mode 100644 index 0000000..ffdc1d8 --- /dev/null +++ b/nginx/sites-available/microscope.com @@ -0,0 +1,39 @@ +# odoo server +upstream odoo-microscope { + server 127.0.0.1:8069; +} + +upstream odoo-microscope-chat { + server 127.0.0.1:8072; +} + +server { + listen 80; + server_name microscope.com; + proxy_read_timeout 300; + proxy_connect_timeout 300; + proxy_send_timeout 300; + # add headers for odoo proxy mode + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + + # log files + access_log /var/log/nginx/microscope.com.access.log; + error_log /var/log/nginx/microscope.com.error.log; + + # redirect requests to odoo backend server + location / { + proxy_redirect off; + proxy_pass http://odoo-microscope; + } + + location /longpolling { + proxy_pass http://odoo-microscope-chat; + } + + # common gzip + gzip_types text/css text/less text/plain text/xml application/xml application/json application/javascript; + gzip on; +} diff --git a/nginx/sites-enabled/microscope.com b/nginx/sites-enabled/microscope.com new file mode 120000 index 0000000..b95ed71 --- /dev/null +++ b/nginx/sites-enabled/microscope.com @@ -0,0 +1 @@ +/etc/nginx/sites-available/microscope.com \ No newline at end of file