Commit b6739037 authored by Christian Boltz's avatar Christian Boltz Committed by Sandro Knauß
Browse files

Move postgresql paths to @{postgresqlpath} variable

This makes the profile more readable and makes adding more paths easier.

With the exception of a rule for pg_upgrade (which missed /opt/pgsql*/),
this commit doesn't change or add permissions.
parent 4ee31b72
......@@ -2,6 +2,8 @@
@{xdg_data_home}=@{HOME}/.local/share
@{postgresqlpath} = /usr/ /usr/lib/postgresql/*/ /opt/pgsql*/
profile postgresql_akonadi {
#include <abstractions/base>
#include <abstractions/bash>
......@@ -18,9 +20,9 @@ profile postgresql_akonadi {
/etc/passwd r,
/{usr/,}bin/{b,d}ash mrix,
/{usr/,}bin/locale mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/initdb mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_ctl mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/postgres mrix,
@{postgresqlpath}/bin/initdb mrix,
@{postgresqlpath}/bin/pg_ctl mrix,
@{postgresqlpath}/bin/postgres mrix,
/usr/share/postgresql/** r,
owner /dev/shm/PostgreSQL.* rw,
owner @{xdg_data_home}/akonadi/** rwlk,
......@@ -28,14 +30,14 @@ profile postgresql_akonadi {
owner /{,var/}run/user/@{uid}/akonadi** rwk,
# pg_upgrade
/{usr/,usr/lib/postgresql/*/}bin/pg_upgrade mrix,
@{postgresqlpath}/bin/pg_upgrade mrix,
/opt/pgsql*/** mr,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_controldata mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_resetwal mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_dumpall mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_dump mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/vacuumdb mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/psql mrix,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_restore mrix,
@{postgresqlpath}/bin/pg_controldata mrix,
@{postgresqlpath}/bin/pg_resetwal mrix,
@{postgresqlpath}/bin/pg_dumpall mrix,
@{postgresqlpath}/bin/pg_dump mrix,
@{postgresqlpath}/bin/vacuumdb mrix,
@{postgresqlpath}/bin/psql mrix,
@{postgresqlpath}/bin/pg_restore mrix,
/{usr/,}bin/cp mrix,
}
......@@ -4,6 +4,8 @@
@{xdg_config_home}=@{HOME}/.config
@{postgresqlpath} = /usr/ /usr/lib/postgresql/*/ /opt/pgsql*/
/usr/bin/akonadiserver {
#include <abstractions/base>
#include <abstractions/consoles>
......@@ -45,9 +47,9 @@
/usr/bin/mysqladmin PUx -> mysqld_akonadi,
/usr/bin/mysqlcheck PUx -> mysqld_akonadi,
/usr/{,s}bin/mysqld PUx -> mysqld_akonadi,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/initdb PUx -> postgresql_akonadi,
/{usr/,usr/lib/postgresql/*/,opt/pgsql*/}bin/pg_ctl PUx -> postgresql_akonadi,
/{usr/,usr/lib/postgresql/*/}bin/pg_upgrade PUx -> postgresql_akonadi,
@{postgresqlpath}/bin/initdb PUx -> postgresql_akonadi,
@{postgresqlpath}/bin/pg_ctl PUx -> postgresql_akonadi,
@{postgresqlpath}/bin/pg_upgrade PUx -> postgresql_akonadi,
/usr/sbin/mysqld PUx -> mysqld_akonadi,
/usr/share/mime/mime.cache r,
/usr/share/mime/packages/ r,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment