--- freeradius-server-3.2.7/debian/freeradius.service +++ freeradius-server-3.2.7/debian/freeradius.service @@ -7,7 +7,6 @@ Type=notify WatchdogSec=60 NotifyAccess=all -EnvironmentFile=-/etc/default/freeradius # FreeRADIUS can do static evaluation of policy language rules based # on environmental variables which is very useful for doing per-host @@ -25,16 +24,15 @@ # Ensure the daemon can still write its pidfile after it drops # privileges. Combination of options that work on a variety of # systems. Test very carefully if you alter these lines. -RuntimeDirectory=freeradius freeradius/tmp +RuntimeDirectory=radiusd radiusd/tmp RuntimeDirectoryMode=0775 # This does not work on Debian Jessie: -User=freerad -Group=freerad -# This does not work on Ubuntu Bionic: -ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius +User=radius +Group=radius -ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout -ExecStart=/usr/sbin/freeradius -f $FREERADIUS_OPTIONS +ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTIONS -Cx -lstdout +ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTIONS +ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure RestartSec=5 ExecReload=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cxm -lstdout @@ -67,10 +65,10 @@ SystemCallArchitectures=native # We shouldn't be writing to the configuration directory -ReadOnlyDirectories=/etc/freeradius/ +ReadOnlyDirectories=/etc/raddb/ # We can read and write to the log directory. -ReadWriteDirectories=/var/log/freeradius/ +ReadWriteDirectories=/var/log/radius/ [Install] WantedBy=multi-user.target