Skip to content

Commit bce434f

Browse files
Istiak Ferdousjaapmarcus
Istiak Ferdous
and
jaapmarcus
authored
Update legacy /var/run directory to /run (#3159)
* Update legacy /var/run directory to /run Refs: https://access.redhat.com/solutions/4154291 https://bugs.launchpad.net/ubuntu/+source/dbus/+bug/1854314 * update ipset url due to 301 redirect * Update sieve upgrade script * Include update script * Force update templates * Fix tests Co-authored-by: Jaap Marcus <9754650+jaapmarcus@users.noreply.github.com>
1 parent 7d73884 commit bce434f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+99
-81
lines changed

‎bin/v-change-sys-hestia-ssl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ cp -f $ssl_dir/certificate.key $HESTIA/ssl/certificate.key
6666

6767
# Restarting web server
6868
if [ "$restart" != 'no' ]; then
69-
kill -HUP $(cat /var/run/hestia-nginx.pid)
69+
kill -HUP $(cat /run/hestia-nginx.pid)
7070
$BIN/v-restart-mail "$restart"
7171
fi
7272

‎bin/v-list-sys-services‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ get_srv_state() {
115115

116116
# Searching pid file
117117
pid_file=''
118-
if [ -e "/var/run/$srv.pid" ]; then
119-
pid_file="/var/run/$srv.pid"
118+
if [ -e "/run/$srv.pid" ]; then
119+
pid_file="/run/$srv.pid"
120120
fi
121-
if [ -z "$pid_file" ] && [ -e "/var/run/$srv/$srv.pid" ]; then
122-
pid_file="/var/run/$srv/$srv.pid"
121+
if [ -z "$pid_file" ] && [ -e "/run/$srv/$srv.pid" ]; then
122+
pid_file="/run/$srv/$srv.pid"
123123
fi
124-
if [ -z "$pid_file" ] && [ -e "/var/run/$name/$name.pid" ]; then
125-
pid_file="/var/run/$name/$name.pid"
124+
if [ -z "$pid_file" ] && [ -e "/run/$name/$name.pid" ]; then
125+
pid_file="/run/$name/$name.pid"
126126
fi
127127
if [ -z "$pid_file" ] && [ -e "/proc/$pid" ]; then
128128
pid_file="/proc/$pid"

‎install/common/dovecot/dovecot.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
protocols = imap pop3
22
listen = *, ::
3-
base_dir = /var/run/dovecot/
3+
base_dir = /run/dovecot/
44
login_greeting = Mail Delivery Agent
55
!include conf.d/*.conf
66
!include_try conf.d/domains/*.conf

‎install/common/firewall/ipset/blacklist.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BLACKLISTS=(
88
"https://www.projecthoneypot.org/list_of_ips.php?t=d&rss=1" # Project Honey Pot Directory of Dictionary Attacker IPs
99
"https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=1.1.1.1" # TOR Exit Nodes
1010
"https://www.maxmind.com/en/high-risk-ip-sample-list" # MaxMind GeoIP Anonymous Proxies
11-
"http://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
11+
"https://danger.rulez.sk/projects/bruteforceblocker/blist.php" # BruteForceBlocker IP List
1212
"https://www.spamhaus.org/drop/drop.lasso" # Spamhaus Don't Route Or Peer List (DROP)
1313
"https://cinsscore.com/list/ci-badguys.txt" # C.I. Army Malicious IP List
1414
"https://lists.blocklist.de/lists/all.txt" # blocklist.de attackers

‎install/deb/clamav/clamd.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Automatically Generated by clamav-daemon postinst
22
#To reconfigure clamd run #dpkg-reconfigure clamav-daemon
33
#Please read /usr/share/doc/clamav-daemon/README.Debian.gz for details
4-
LocalSocket /var/run/clamav/clamd.ctl
4+
LocalSocket /run/clamav/clamd.ctl
55
FixStaleSocket true
66
LocalSocketGroup clamav
77
LocalSocketMode 666
@@ -84,5 +84,5 @@ LogFileMaxSize 0
8484
Bytecode true
8585
BytecodeSecurity TrustSigned
8686
BytecodeTimeout 60000
87-
PidFile /var/run/clamav/clamd.pid
87+
PidFile /run/clamav/clamd.pid
8888
OnAccessMaxFileSize 5M

‎install/deb/exim/exim4.conf.4.94.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spamd_address = 127.0.0.1 783
3333
.endif
3434

3535
.ifdef CLAMD
36-
av_scanner = clamd: /var/run/clamav/clamd.ctl
36+
av_scanner = clamd: /run/clamav/clamd.ctl
3737
.endif
3838

3939
log_selector = +tls_sni
@@ -246,13 +246,13 @@ smtp_relay_login:
246246
dovecot_plain:
247247
driver = dovecot
248248
public_name = PLAIN
249-
server_socket = /var/run/dovecot/auth-client
249+
server_socket = /run/dovecot/auth-client
250250
server_set_id = $auth1
251251

252252
dovecot_login:
253253
driver = dovecot
254254
public_name = LOGIN
255-
server_socket = /var/run/dovecot/auth-client
255+
server_socket = /run/dovecot/auth-client
256256
server_set_id = $auth1
257257

258258

‎install/deb/exim/exim4.conf.template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spamd_address = 127.0.0.1 783
3333
.endif
3434

3535
.ifdef CLAMD
36-
av_scanner = clamd: /var/run/clamav/clamd.ctl
36+
av_scanner = clamd: /run/clamav/clamd.ctl
3737
.endif
3838

3939
log_selector = +tls_sni
@@ -248,13 +248,13 @@ smtp_relay_login:
248248
dovecot_plain:
249249
driver = dovecot
250250
public_name = PLAIN
251-
server_socket = /var/run/dovecot/auth-client
251+
server_socket = /run/dovecot/auth-client
252252
server_set_id = $auth1
253253

254254
dovecot_login:
255255
driver = dovecot
256256
public_name = LOGIN
257-
server_socket = /var/run/dovecot/auth-client
257+
server_socket = /run/dovecot/auth-client
258258
server_set_id = $auth1
259259

260260

‎install/deb/logrotate/apache2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
sharedscripts
1010
postrotate
1111
/etc/init.d/apache2 reload > /dev/null || true
12-
[ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid`
12+
[ ! -f /run/nginx.pid ] || kill -USR1 `cat /run/nginx.pid`
1313
endscript
1414
prerotate
1515
if [ -d /etc/logrotate.d/httpd-prerotate ]; then \

‎install/deb/logrotate/nginx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
create 640
99
sharedscripts
1010
postrotate
11-
[ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid`
11+
[ -f /run/nginx.pid ] && kill -USR1 `cat /run/nginx.pid`
1212
endscript
1313
}

‎install/deb/mysql/my-large.cnf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[client]
22
port=3306
3-
socket=/var/run/mysqld/mysqld.sock
3+
socket=/run/mysqld/mysqld.sock
44

55
[mysqld_safe]
6-
socket=/var/run/mysqld/mysqld.sock
6+
socket=/run/mysqld/mysqld.sock
77

88
[mysqld]
99
user=mysql
10-
pid-file=/var/run/mysqld/mysqld.pid
11-
socket=/var/run/mysqld/mysqld.sock
10+
pid-file=/run/mysqld/mysqld.pid
11+
socket=/run/mysqld/mysqld.sock
1212
port=3306
1313
basedir=/usr
1414
datadir=/var/lib/mysql

0 commit comments

Comments
 (0)