diff options
author | Jan Rybar <jrybar@redhat.com> | 2021-04-13 16:56:11 +0000 |
---|---|---|
committer | Jan Rybar <jrybar@redhat.com> | 2021-04-13 16:56:11 +0000 |
commit | 7dd61b9ccf44a4811ae1257d9ff4fecfd40894bd (patch) | |
tree | d39df4d83361122ef2395867010145eff34367d8 /docs | |
parent | 2c8287fbd55c5d092370428a1bdbbf0a9fd7d537 (diff) | |
download | polkit-revert-2c8287fb.tar.gz |
Revert "Merge branch 'pwithnall/polkit-51-usr-local-share-is-my-homeboy' into 'master'"revert-2c8287fb
This reverts merge request !75
Diffstat (limited to 'docs')
-rw-r--r-- | docs/man/polkit.xml | 23 | ||||
-rw-r--r-- | docs/polkit-1-diagrams.svg | 108 | ||||
-rw-r--r-- | docs/polkit-architecture.png | bin | 73726 -> 63503 bytes |
3 files changed, 56 insertions, 75 deletions
diff --git a/docs/man/polkit.xml b/docs/man/polkit.xml index 8f6a26f..99aa474 100644 --- a/docs/man/polkit.xml +++ b/docs/man/polkit.xml @@ -107,11 +107,10 @@ System Context | | | | /usr/share/polkit-1/actions/*.policy | | +--------------------------------------+ | - +--------------------------------------------+ - | /etc/polkit-1/rules.d/*.rules | - | /usr/local/share/polkit-1/rules.d/*.rules | - | /usr/share/polkit-1/rules.d/*.rules | - +--------------------------------------------+ + +--------------------------------------+ + | /etc/polkit-1/rules.d/*.rules | + | /usr/share/polkit-1/rules.d/*.rules | + +--------------------------------------+ ]]></programlisting> </textobject> </mediaobject> @@ -474,28 +473,24 @@ System Context | | <para> <command>polkitd</command> reads <filename class='extension'>.rules</filename> files from the - <filename class='directory'>/etc/polkit-1/rules.d</filename>, - <filename class='directory'>/usr/local/share/polkit-1/rules.d</filename> - and <filename class='directory'>/usr/share/polkit-1/rules.d</filename> + <filename class='directory'>/etc/polkit-1/rules.d</filename> and + <filename class='directory'>/usr/share/polkit-1/rules.d</filename> directories by sorting the files in lexical order based on the basename on each file (if there's a tie, files in <filename class='directory'>/etc</filename> are processed before files in - <filename class='directory'>/usr/local</filename>, which is in turn - processed before <filename class='directory'>/usr</filename>). - For example, for the following six + <filename class='directory'>/usr</filename>). + For example, for the following four files, the order is </para> <itemizedlist mark='opencircle' spacing='compact'> <listitem><para><filename>/etc/polkit-1/rules.d/10-auth.rules</filename></para></listitem> - <listitem><para><filename>/usr/local/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem> <listitem><para><filename>/usr/share/polkit-1/rules.d/10-auth.rules</filename></para></listitem> <listitem><para><filename>/etc/polkit-1/rules.d/15-auth.rules</filename></para></listitem> <listitem><para><filename>/usr/share/polkit-1/rules.d/20-auth.rules</filename></para></listitem> - <listitem><para><filename>/usr/local/share/polkit-1/rules.d/25-others.rules</filename></para></listitem> </itemizedlist> <para> - All three directories are monitored so if a rules file is changed, + Both directories are monitored so if a rules file is changed, added or removed, existing rules are purged and all files are read and processed again. Rules files are written in the <ulink url="http://en.wikipedia.org/wiki/JavaScript">JavaScript</ulink> diff --git a/docs/polkit-1-diagrams.svg b/docs/polkit-1-diagrams.svg index 235e22e..d595ce8 100644 --- a/docs/polkit-1-diagrams.svg +++ b/docs/polkit-1-diagrams.svg @@ -14,7 +14,7 @@ height="1052.3622047" id="svg270" sodipodi:version="0.32" - inkscape:version="0.92.3 (2405546, 2018-03-11)" + inkscape:version="0.48.2 r9819" sodipodi:docname="polkit-1-diagrams.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1"> @@ -562,7 +562,7 @@ x2="196.4196" y1="89.181732" x1="52.07793" - gradientTransform="matrix(1.7257205,0,0,0.71046269,163.79547,451.35903)" + gradientTransform="matrix(1.5328769,0,0,0.51700825,173.82749,458.25449)" gradientUnits="userSpaceOnUse" id="linearGradient4001" xlink:href="#linearGradient3144-1-7-5" @@ -677,13 +677,13 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="251.03118" - inkscape:cy="629.56492" + inkscape:cx="347.45975" + inkscape:cy="686.70778" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="1920" - inkscape:window-height="1016" + inkscape:window-width="1600" + inkscape:window-height="841" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" /> @@ -695,7 +695,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -745,7 +745,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="481.04681" y="90.185196" id="text7646" @@ -756,10 +756,10 @@ x="481.04681" y="90.185196" id="tspan7654" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle">Subject</tspan></text> + style="text-align:center;text-anchor:middle">Subject</tspan></text> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="243.28027" y="77.398422" id="text7678" @@ -769,12 +769,12 @@ sodipodi:role="line" x="243.28027" y="77.398422" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan7688">Authentication</tspan><tspan sodipodi:role="line" x="243.28027" y="92.398422" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan887">Agent</tspan></text> <rect style="fill:url(#linearGradient13600);fill-opacity:1;stroke:#030000;stroke-width:0.55500662;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:19" @@ -788,7 +788,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="286.21173" y="332.54059" id="text13586" @@ -798,16 +798,16 @@ sodipodi:role="line" x="286.21173" y="332.54059" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan13590">org.freedesktop.</tspan><tspan sodipodi:role="line" x="286.21173" y="347.54059" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan13606">PolicyKit1</tspan></text> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="489.5925" y="283.14468" id="text13594" @@ -817,7 +817,7 @@ sodipodi:role="line" x="489.5925" y="283.14468" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan740">Mechanism</tspan></text> <path sodipodi:type="arc" @@ -834,7 +834,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="349.52975" y="210.38663" id="text16841" @@ -844,21 +844,21 @@ sodipodi:role="line" x="349.52975" y="210.38663" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan16845">System</tspan><tspan sodipodi:role="line" x="349.52975" y="225.38663" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan16849">Message</tspan><tspan sodipodi:role="line" x="349.52975" y="240.38663" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan16851">Bus</tspan></text> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="93.62104" y="143.63353" id="text22909" @@ -868,11 +868,11 @@ sodipodi:role="line" x="93.62104" y="143.63353" - style="font-size:18px;line-height:1.25;text-align:center;text-anchor:middle" + style="font-size:18px;text-align:center;text-anchor:middle" id="tspan22917">User Session</tspan></text> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="108.55364" y="202.5914" id="text22919" @@ -882,7 +882,7 @@ sodipodi:role="line" x="108.55364" y="202.5914" - style="font-size:18px;line-height:1.25;text-align:center;text-anchor:middle" + style="font-size:18px;text-align:center;text-anchor:middle" id="tspan22927">System Context</tspan></text> <rect style="fill:url(#linearGradient709);fill-opacity:1;stroke:#030000;stroke-width:0.42205292;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:19" @@ -896,7 +896,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="487.01651" y="325.36105" id="text28990-4" @@ -906,7 +906,7 @@ sodipodi:role="line" x="487.01651" y="325.36105" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan649-8">libpolkit-gobject-1</tspan></text> <rect style="fill:url(#linearGradient860);fill-opacity:1;stroke:#030000;stroke-width:0.35916778;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:19" @@ -920,7 +920,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="244.12958" y="122.78507" id="text28990-4-5" @@ -930,7 +930,7 @@ sodipodi:role="line" x="244.12958" y="122.78507" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan649-8-8">libpolkit-agent-1</tspan></text> <path style="fill:none;stroke:#000000;stroke-width:1px;stroke-opacity:1;marker-start:url(#Arrow2Lstart);marker-mid:none;marker-end:url(#Arrow2Lend)" @@ -968,7 +968,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="445.0928" y="434.35934" id="text13594-3" @@ -978,35 +978,35 @@ sodipodi:role="line" x="445.0928" y="434.35934" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan740-0">/usr/share/polkit-1/actions/*.policy</tspan></text> <rect - style="fill:url(#linearGradient4001);fill-opacity:1;stroke:#030000;stroke-width:0.99654835;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:19;stroke-opacity:1" + style="fill:url(#linearGradient4001);fill-opacity:1;stroke:#030000;stroke-width:0.80120724;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:19" id="rect7676-4-5-7" - width="247.54021" - height="75.355957" - x="254.4442" - y="477.04132" + width="219.8784" + height="54.837009" + x="254.34653" + y="476.94366" inkscape:export-filename="/home/davidz/Hacking/polkit/docs/polkit-architecture.png" inkscape:export-xdpi="96.720001" inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" - x="378.04199" - y="514.10132" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" + x="362.57547" + y="513.7879" id="text13594-3-0" inkscape:export-filename="/home/davidz/Hacking/polkit/docs/polkit-architecture.png" inkscape:export-xdpi="96.720001" inkscape:export-ydpi="96.720001"><tspan sodipodi:role="line" - x="378.04199" - y="514.10132" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" - id="tspan740-0-5">/usr/local/share/polkit-1/rules.d/*.rules</tspan></text> + x="362.57547" + y="513.7879" + style="text-align:center;text-anchor:middle" + id="tspan740-0-5">/usr/share/polkit-1/rules.d/*.rules</tspan></text> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="343.2959" y="494.95844" id="text13594-3-0-8" @@ -1016,7 +1016,7 @@ sodipodi:role="line" x="343.2959" y="494.95844" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan740-0-5-4">/etc/polkit-1/rules.d/*.rules</tspan></text> <path inkscape:connector-curvature="0" @@ -1048,7 +1048,7 @@ inkscape:export-ydpi="96.720001" /> <text xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" x="283.71991" y="300.79523" id="text28990-4-5-6" @@ -1058,21 +1058,7 @@ sodipodi:role="line" x="283.71991" y="300.79523" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" + style="text-align:center;text-anchor:middle" id="tspan649-8-8-7">polkitd(8)</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;line-height:0%;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none" - x="362.57547" - y="533.24414" - id="text13594-3-0-3" - inkscape:export-filename="/home/davidz/Hacking/polkit/docs/polkit-architecture.png" - inkscape:export-xdpi="96.720001" - inkscape:export-ydpi="96.720001"><tspan - sodipodi:role="line" - x="362.57547" - y="533.24414" - style="font-size:12px;line-height:1.25;text-align:center;text-anchor:middle" - id="tspan740-0-5-6">/usr/share/polkit-1/rules.d/*.rules</tspan></text> </g> </svg> diff --git a/docs/polkit-architecture.png b/docs/polkit-architecture.png Binary files differindex c107922..57e1ba2 100644 --- a/docs/polkit-architecture.png +++ b/docs/polkit-architecture.png |