added pages & media
This commit is contained in:
parent
9e426540ab
commit
5b9638fa6e
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
|
|
@ -0,0 +1,586 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="128.17094"
|
||||
height="128.03864"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.48.1 "
|
||||
sodipodi:docname="dokuwiki-logo.svg"
|
||||
version="1.1">
|
||||
<title
|
||||
id="title3181">DokuWiki Logo</title>
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
id="linearGradient2624">
|
||||
<stop
|
||||
style="stop-color:#3a9030;stop-opacity:0.83673471;"
|
||||
offset="0"
|
||||
id="stop2626" />
|
||||
<stop
|
||||
style="stop-color:#3d9c32;stop-opacity:0.79591835;"
|
||||
offset="1"
|
||||
id="stop2628" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2612">
|
||||
<stop
|
||||
style="stop-color:#25901b;stop-opacity:0.83673471;"
|
||||
offset="0"
|
||||
id="stop2614" />
|
||||
<stop
|
||||
style="stop-color:#25901b;stop-opacity:0.37755102;"
|
||||
offset="1"
|
||||
id="stop2616" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2600">
|
||||
<stop
|
||||
style="stop-color:#e32525;stop-opacity:0.81632656;"
|
||||
offset="0"
|
||||
id="stop2602" />
|
||||
<stop
|
||||
style="stop-color:#e32525;stop-opacity:0.5714286;"
|
||||
offset="1"
|
||||
id="stop2604" />
|
||||
</linearGradient>
|
||||
<marker
|
||||
inkscape:stockid="TriangleOutL"
|
||||
orient="auto"
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="TriangleOutL"
|
||||
style="overflow:visible">
|
||||
<path
|
||||
id="path2488"
|
||||
d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
|
||||
style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
|
||||
transform="scale(0.8,0.8)"
|
||||
inkscape:connector-curvature="0" />
|
||||
</marker>
|
||||
<marker
|
||||
inkscape:stockid="Arrow2Lstart"
|
||||
orient="auto"
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="Arrow2Lstart"
|
||||
style="overflow:visible">
|
||||
<path
|
||||
id="path2571"
|
||||
style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
|
||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
||||
transform="matrix(1.1,0,0,1.1,-5.5,0)"
|
||||
inkscape:connector-curvature="0" />
|
||||
</marker>
|
||||
<linearGradient
|
||||
id="linearGradient2408">
|
||||
<stop
|
||||
id="stop2410"
|
||||
offset="0"
|
||||
style="stop-color:#000000;stop-opacity:0.17346939;" />
|
||||
<stop
|
||||
id="stop2412"
|
||||
offset="1"
|
||||
style="stop-color:#c7cec2;stop-opacity:0;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2389">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0.17346939;"
|
||||
offset="0"
|
||||
id="stop2391" />
|
||||
<stop
|
||||
style="stop-color:#c7cec2;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop2393" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2370">
|
||||
<stop
|
||||
style="stop-color:#fbfaf9;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2372" />
|
||||
<stop
|
||||
style="stop-color:#e9dac7;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2374" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2364">
|
||||
<stop
|
||||
id="stop2366"
|
||||
offset="0"
|
||||
style="stop-color:#fbf6f0;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop2368"
|
||||
offset="1"
|
||||
style="stop-color:#e9dac7;stop-opacity:1;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2348">
|
||||
<stop
|
||||
style="stop-color:#fbf6f0;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2350" />
|
||||
<stop
|
||||
style="stop-color:#e9dac7;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2352" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2332">
|
||||
<stop
|
||||
style="stop-color:#ede1ae;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2334" />
|
||||
<stop
|
||||
style="stop-color:#fefdfa;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2336" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2249">
|
||||
<stop
|
||||
style="stop-color:#00a423;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2251" />
|
||||
<stop
|
||||
style="stop-color:#00b427;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2253" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2229">
|
||||
<stop
|
||||
id="stop2231"
|
||||
offset="0"
|
||||
style="stop-color:#00b62b;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop2233"
|
||||
offset="1"
|
||||
style="stop-color:#a1d784;stop-opacity:1;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2213">
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2215" />
|
||||
<stop
|
||||
style="stop-color:#000000;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop2217" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2360">
|
||||
<stop
|
||||
style="stop-color:#d69c00;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2362" />
|
||||
<stop
|
||||
style="stop-color:#ffe658;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2364" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2352">
|
||||
<stop
|
||||
id="stop2354"
|
||||
offset="0"
|
||||
style="stop-color:#ce411e;stop-opacity:1;" />
|
||||
<stop
|
||||
id="stop2356"
|
||||
offset="1"
|
||||
style="stop-color:#ecad8d;stop-opacity:1;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient2336">
|
||||
<stop
|
||||
style="stop-color:#8f2a15;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop2338" />
|
||||
<stop
|
||||
style="stop-color:#c8381b;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop2340" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2336"
|
||||
id="linearGradient2342"
|
||||
x1="219.21262"
|
||||
y1="189.01556"
|
||||
x2="286.22665"
|
||||
y2="189.01556"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2352"
|
||||
id="linearGradient2350"
|
||||
x1="219.66267"
|
||||
y1="192.73286"
|
||||
x2="277.8761"
|
||||
y2="192.73286"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2360"
|
||||
id="radialGradient2366"
|
||||
cx="224.41418"
|
||||
cy="212.80016"
|
||||
fx="224.41418"
|
||||
fy="212.80016"
|
||||
r="8.6813803"
|
||||
gradientTransform="matrix(1,0,0,0.984179,0,3.366635)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2249"
|
||||
id="linearGradient2227"
|
||||
x1="192.03938"
|
||||
y1="262.25757"
|
||||
x2="263.67093"
|
||||
y2="262.25757"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2229"
|
||||
id="linearGradient2247"
|
||||
x1="191.75092"
|
||||
y1="258.91571"
|
||||
x2="255.6561"
|
||||
y2="258.91571"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2360"
|
||||
id="radialGradient2317"
|
||||
cx="257.41144"
|
||||
cy="274.64203"
|
||||
fx="257.41144"
|
||||
fy="274.64203"
|
||||
r="7.1440549"
|
||||
gradientTransform="matrix(1,0,0,1.631384,0,-173.4045)"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2360"
|
||||
id="linearGradient2325"
|
||||
x1="184.07063"
|
||||
y1="246.35907"
|
||||
x2="201.40646"
|
||||
y2="246.35907"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2332"
|
||||
id="linearGradient2346"
|
||||
x1="162.76369"
|
||||
y1="184.99277"
|
||||
x2="240.84924"
|
||||
y2="289.50323"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2348"
|
||||
id="linearGradient2354"
|
||||
x1="140.15784"
|
||||
y1="303.78967"
|
||||
x2="136.14151"
|
||||
y2="195.87151"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2370"
|
||||
id="linearGradient2362"
|
||||
x1="286.15598"
|
||||
y1="262.28729"
|
||||
x2="185.81258"
|
||||
y2="172.32423"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2389"
|
||||
id="linearGradient2395"
|
||||
x1="213.96568"
|
||||
y1="220.07191"
|
||||
x2="244.79126"
|
||||
y2="265.40363"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2408"
|
||||
id="linearGradient2406"
|
||||
x1="184.30582"
|
||||
y1="241.52789"
|
||||
x2="224.67441"
|
||||
y2="307.52844"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2600"
|
||||
id="linearGradient2606"
|
||||
x1="202.41772"
|
||||
y1="222.05145"
|
||||
x2="206.06017"
|
||||
y2="210.3558"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2612"
|
||||
id="linearGradient2618"
|
||||
x1="248.62152"
|
||||
y1="234.52202"
|
||||
x2="251.64362"
|
||||
y2="213.12164"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2624"
|
||||
id="linearGradient2630"
|
||||
x1="275.71765"
|
||||
y1="251.56442"
|
||||
x2="255.68353"
|
||||
y2="217.94008"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2352"
|
||||
id="linearGradient2640"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="219.66267"
|
||||
y1="192.73286"
|
||||
x2="277.8761"
|
||||
y2="192.73286" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2336"
|
||||
id="linearGradient2643"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="219.21262"
|
||||
y1="189.01556"
|
||||
x2="286.22665"
|
||||
y2="189.01556" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient2360"
|
||||
id="radialGradient2647"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(1,0,0,0.984179,0,3.366635)"
|
||||
cx="224.41418"
|
||||
cy="212.80016"
|
||||
fx="224.41418"
|
||||
fy="212.80016"
|
||||
r="8.6813803" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="2.03"
|
||||
inkscape:cx="35.144424"
|
||||
inkscape:cy="83.160427"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer3"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="716"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
showgrid="false"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:showpageshadow="false"
|
||||
showborder="true"
|
||||
borderlayer="false" />
|
||||
<metadata
|
||||
id="metadata7">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title>DokuWiki Logo</dc:title>
|
||||
<dc:creator>
|
||||
<cc:Agent>
|
||||
<dc:title>Esther Brunner</dc:title>
|
||||
</cc:Agent>
|
||||
</dc:creator>
|
||||
<cc:license
|
||||
rdf:resource="http://www.gnu.org/licenses/gpl-2.0.html" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer3"
|
||||
inkscape:label="paper"
|
||||
style="display:inline"
|
||||
transform="translate(-158.10602,-158.67323)">
|
||||
<g
|
||||
id="g1419"
|
||||
transform="matrix(0.99993322,0,0,0.9959778,0.01483419,0.8957919)">
|
||||
<g
|
||||
id="g2376">
|
||||
<path
|
||||
transform="matrix(0.989976,-0.141236,0.201069,0.979577,0,0)"
|
||||
style="fill:url(#linearGradient2354);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.7216621px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
|
||||
d="m 120.21543,196.43769 70.90655,-0.79226 -2.40261,109.05308 -71.71761,0.37344 3.21367,-108.63426 z"
|
||||
id="rect1422"
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2362);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
|
||||
d="m 179.20033,182.08731 79.84173,-19.51687 26.61391,101.72428 -82.50312,21.58684 -23.95252,-103.79425 z"
|
||||
id="rect1425"
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
transform="matrix(0.995676,-0.09289891,0.08102261,0.996712,0,0)"
|
||||
style="fill:url(#linearGradient2346);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00418305px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
|
||||
d="m 159.01353,181.74387 85.58587,0.53396 0,110.47429 -84.53387,-2.5127 -1.052,-108.49555 z"
|
||||
id="rect1419"
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
id="text2382"
|
||||
d="m 167.55116,214.00773 0,-20.1846 5.34962,0 0,2.37403 -2.48145,0 0,15.43654 2.48145,0 0,2.37403 -5.34962,0 m 7.34767,0 0,-20.1846 5.34961,0 0,2.37403 -2.48144,0 0,15.43654 2.48144,0 0,2.37403 -5.34961,0 m 7.36915,-20.1846 5.81153,0 c 1.31054,2e-5 2.30956,0.10028 2.99707,0.30078 0.92382,0.27216 1.71516,0.75555 2.37403,1.4502 0.65884,0.69468 1.16014,1.54689 1.50391,2.55664 0.34373,1.00262 0.51561,2.24155 0.51562,3.71681 -10e-6,1.29623 -0.16115,2.41342 -0.4834,3.35156 -0.39389,1.14584 -0.95607,2.07325 -1.68652,2.78223 -0.55145,0.53711 -1.29624,0.95606 -2.23438,1.25684 -0.70183,0.222 -1.63999,0.33301 -2.81446,0.33301 l -5.9834,0 0,-15.74807 m 3.17969,2.66407 0,10.43067 2.37402,0 c 0.88802,1e-5 1.52897,-0.0501 1.92286,-0.15039 0.51561,-0.1289 0.94172,-0.34732 1.27832,-0.65527 0.34374,-0.30794 0.62304,-0.81282 0.83789,-1.51465 0.21483,-0.70898 0.32226,-1.6722 0.32227,-2.88965 -1e-5,-1.21744 -0.10744,-2.15201 -0.32227,-2.80372 -0.21485,-0.65168 -0.51563,-1.16014 -0.90234,-1.52539 -0.38673,-0.36522 -0.87729,-0.61229 -1.47168,-0.74121 -0.44402,-0.10025 -1.31414,-0.15038 -2.61036,-0.15039 l -1.42871,0 m 14.96388,13.084 -3.75977,-15.74807 3.25489,0 2.37403,10.8174 2.87891,-10.8174 3.78125,0 2.76074,11.00002 2.417,-11.00002 3.20118,0 -3.82423,15.74807 -3.37305,0 -3.13672,-11.77345 -3.12598,11.77345 -3.44825,0 m 22.76272,-15.74807 0,20.1846 -5.34961,0 0,-2.37403 2.48145,0 0,-15.45803 -2.48145,0 0,-2.35254 5.34961,0 m 7.34767,0 0,20.1846 -5.34962,0 0,-2.37403 2.48145,0 0,-15.45803 -2.48145,0 0,-2.35254 5.34962,0"
|
||||
style="font-size:12.0000124px;font-style:normal;font-weight:normal;line-height:125%;fill:#6184a3;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Vera Sans"
|
||||
transform="matrix(0.995433,-0.09546066,0.09546066,0.995433,0,0)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<g
|
||||
id="g2632"
|
||||
style="display:inline">
|
||||
<path
|
||||
style="fill:url(#linearGradient2606);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;marker-end:none"
|
||||
d="m 174.75585,201.60224 c -6.04576,2.46667 -10.16789,4.4194 -12.88454,6.35064 -2.71665,1.93124 -3.19257,4.60007 -3.24631,6.26587 -0.0269,0.8329 0.0809,1.77774 0.63189,2.44014 0.55103,0.6624 1.80769,1.87421 2.75794,2.38558 1.90049,1.02274 7.5417,2.42901 10.51899,3.07308 11.90917,2.57627 26.80568,1.68117 26.80568,1.68117 1.69307,1.2452 2.83283,2.82434 3.269,4.26902 4.5766,-1.88674 11.81084,-6.58439 13.15657,-8.57706 -5.45142,-4.19955 -10.79692,-6.33346 -16.51317,-8.30847 -1.59867,-0.71918 -2.87956,-1.22649 -0.71773,2.55635 0.98506,2.47275 0.85786,5.05143 0.57176,7.41825 0,0 -16.52749,0.40678 -28.23838,-2.1266 -2.92772,-0.63334 -5.46627,-0.95523 -7.21875,-1.89832 -0.87624,-0.47154 -1.48296,-0.8208 -1.91578,-1.3411 -0.43282,-0.5203 -0.2196,-1.29055 -0.20128,-1.85858 0.0366,-1.13607 0.25336,-1.67063 2.86177,-3.52492 2.60841,-1.85429 5.65407,-3.36195 11.65936,-5.81211 -0.0877,-1.29125 -0.29025,-2.5059 -1.29702,-2.99294 z"
|
||||
id="path2414"
|
||||
sodipodi:nodetypes="csssssccccccssssscc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2618);fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
d="m 269.62539,220.7482 c -1.43576,-0.13963 -2.58044,0.30288 -2.56084,1.50218 0.94391,0.85652 1.34942,2.43518 1.48562,3.14008 0.1362,0.7049 0.0359,1.21914 -0.48562,1.89004 -1.043,1.3418 -3.12498,1.56875 -6.5006,2.72063 -6.75124,2.30377 -16.89306,2.52561 -27.90689,3.84639 -22.02767,2.64157 -39.03164,3.76107 -39.03164,3.76107 1.98346,-4.64758 6.32828,-4.41197 6.34903,-8.20969 0.27376,-0.89755 -3.14597,-1.31638 -5.09943,-0.10731 -4.26694,3.70137 -7.59152,6.75353 -10.69418,10.51311 l 1.88795,3.08438 c 0,0 26.13006,-2.88973 48.19776,-5.5361 11.03385,-1.32318 20.95601,-1.99856 27.80968,-4.33728 3.42683,-1.16936 5.95975,-1.49022 7.6409,-3.51958 0.63172,-0.76256 1.35238,-3.04699 1.06804,-4.73369 -0.21951,-1.30213 -1.14979,-3.09774 -2.15978,-4.01423 z"
|
||||
id="path2608"
|
||||
sodipodi:nodetypes="ccsssscccccssssc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2630);fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
d="m 254.36185,220.33948 c -6.84997,3.24198 -7.15311,8.60912 -5.95953,12.79884 1.19358,4.18972 5.26293,8.75677 9.32121,12.40608 8.11656,7.29861 12.06046,9.33163 12.06046,9.33163 -3.71515,-0.10342 -7.89887,-1.41174 -8.13315,0.49304 -0.9483,2.97582 11.49137,3.47486 17.43787,2.70205 -1.39456,-7.57836 -3.79323,-13.21546 -7.73151,-14.90312 -1.68464,-0.14804 0.31242,4.72441 0.76985,9.39604 0,0 -3.62454,-1.73122 -11.60519,-8.90762 -3.99032,-3.5882 -7.37386,-7.3421 -8.47319,-11.20099 -1.09933,-3.85889 0.0776,-6.1205 4.95082,-9.53176 0.92816,-0.99528 -1.28985,-2.45913 -2.63764,-2.58419 z"
|
||||
id="path2620"
|
||||
sodipodi:nodetypes="csscccccsscc"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<path
|
||||
sodipodi:nodetypes="cccccc"
|
||||
id="rect2386"
|
||||
d="m 213.96569,234.57806 2.18756,-14.42897 15.21982,6.08793 21.49387,29.94828 -20.40591,9.21832 -18.49534,-30.82556 z"
|
||||
style="fill:url(#linearGradient2395);fill-opacity:1;stroke:none;display:inline"
|
||||
inkscape:connector-curvature="0" />
|
||||
<g
|
||||
id="g2649"
|
||||
style="display:inline">
|
||||
<path
|
||||
style="fill:url(#radialGradient2647);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="m 232.55816,219.5295 -15.92827,0.32199 3.08809,-15.15716 12.84018,14.83517 z"
|
||||
id="path1443"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#812310;fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
d="m 221.60041,219.29315 -4.41205,0.0782 0.85429,-3.98263 3.55776,3.90445 z"
|
||||
id="path1452"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2643);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="m 269.44172,159.27421 0.098,8.91471 8.0581,8.72344 7.75906,0.7992 -52.80669,41.84092 -6.66532,-3.30696 -5.08243,-5.618 -1.08987,-5.91194 49.72911,-45.44137 z"
|
||||
id="rect1437"
|
||||
sodipodi:nodetypes="ccccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2640);fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
d="m 268.94766,168.32844 8.3426,8.82719 -51.1007,38.68262 -4.9197,-5.4436 47.6778,-42.06621 z"
|
||||
id="rect1446"
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#ffe965;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;display:inline"
|
||||
d="m 285.33776,177.73216 -8.16219,-0.86619 -7.7518,-8.67862 0.0132,-9.14293 8.36213,0.75209 7.18862,9.57682 0.35007,8.35883 z"
|
||||
id="path1440"
|
||||
sodipodi:nodetypes="ccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#cb391c;fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||
d="m 280.72049,168.46367 0.1644,4.05654 -3.81335,-0.71676 -2.87504,-3.18901 -0.28089,-3.53393 3.85447,-0.16637 2.95041,3.54953 z"
|
||||
id="path1449"
|
||||
sodipodi:nodetypes="ccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g2657"
|
||||
style="display:inline">
|
||||
<path
|
||||
style="fill:url(#linearGradient2406);fill-opacity:1;stroke:none"
|
||||
d="m 183.88617,256.82796 0.99991,-16.30721 17.2878,8.44012 26.05488,38.00946 -29.28095,-1.13363 -15.06164,-29.00874 z"
|
||||
id="rect2397"
|
||||
sodipodi:nodetypes="cccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2325);fill-opacity:1;stroke:#000000;stroke-linejoin:round;stroke-opacity:1;display:inline"
|
||||
d="m 200.90647,238.44836 -8.04601,15.77386 -7.05577,-13.57337 15.10178,-2.20049 z"
|
||||
id="rect2207"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2227);fill-opacity:1;stroke:#000000;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="m 201.05389,238.55401 62.11704,24.91912 -7.88689,3.21429 -4.35152,9.30976 1.1716,9.96396 -59.31453,-31.72759 -0.49402,-7.36382 3.09592,-5.82826 5.6624,-2.48746 z"
|
||||
id="rect1328"
|
||||
sodipodi:nodetypes="ccccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#radialGradient2317);fill-opacity:1;stroke:#000000;stroke-linejoin:round;stroke-opacity:1;display:inline"
|
||||
d="m 255.27801,266.53504 7.9241,-3.04772 0.85337,10.24037 -3.9011,8.28983 -8.04601,3.77919 -1.341,-9.63083 4.51064,-9.63084 z"
|
||||
id="rect2204"
|
||||
sodipodi:nodetypes="ccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:url(#linearGradient2247);fill-opacity:1;stroke:none;display:inline"
|
||||
d="m 195.7549,241.421 59.13059,24.7962 -4.5917,9.76614 -57.48995,-29.00967 2.95106,-5.55267 z"
|
||||
id="rect2210"
|
||||
sodipodi:nodetypes="ccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#00b527;fill-opacity:1;stroke:none"
|
||||
d="m 255.02263,275.21029 2.08411,-4.1069 2.96459,-1.06995 0.69433,3.37197 -1.76759,3.85723 -3.15516,1.38315 -0.82028,-3.4355 z"
|
||||
id="rect2308"
|
||||
sodipodi:nodetypes="ccccccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="fill:#258209;fill-opacity:1;stroke:none;display:inline"
|
||||
d="m 186.56849,241.00362 3.54963,-0.47312 -2.02297,3.53926 -1.52666,-3.06614 z"
|
||||
id="rect2327"
|
||||
sodipodi:nodetypes="cccc"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 131 KiB |
|
|
@ -0,0 +1 @@
|
|||
You can safely delete this file.
|
||||
|
|
@ -0,0 +1 @@
|
|||
You can safely delete this file.
|
||||
|
|
@ -0,0 +1 @@
|
|||
1640413759 122.58.76.78 C en:vulnerability_scans:log4shell.jpg dan created 13725
|
||||
|
|
@ -0,0 +1 @@
|
|||
1638082972 10.0.1.2 C license.png dan created 1515
|
||||
|
|
@ -0,0 +1 @@
|
|||
1637821267 10.0.1.2 C wiki:favicon.ico dan created 58877
|
||||
|
|
@ -0,0 +1 @@
|
|||
1637783265 10.0.1.2 C wiki:logo.png dan created 134478
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:backup: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:desktop: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
====== KDE ======
|
||||
|
||||
<code>
|
||||
pacman -S plasma xorg
|
||||
</code>
|
||||
|
||||
<code>
|
||||
systemctl enable --now sddm
|
||||
</code>
|
||||
|
||||
Das war's eigentlich schon.
|
||||
|
||||
Schaue dir die gesamte [[https://archlinux.org/groups/x86_64/kde-applications/|KDE-Software]] liste und die vorgeschlagenen Pakete unten an und installiere, was dir gefällt.
|
||||
|
||||
|
||||
====== Empfohlene Software ======
|
||||
|
||||
Füge die Pakete einfach dem oben genannten ''pacman''-Befehl hinzu.
|
||||
|
||||
===== System =====
|
||||
|
||||
<code>
|
||||
networkmanager-openvpn wireguard-tools keepassxc arch-audit konsole keditbookmarks gparted htop dolphin spectacle wget lm_sensors ark kleopatra kate kompare rsync
|
||||
</code>
|
||||
|
||||
===== Audio =====
|
||||
|
||||
<code>
|
||||
pulseaudio pulseaudio-alsa
|
||||
</code>
|
||||
|
||||
===== Multimedia/Graphics =====
|
||||
|
||||
<code>
|
||||
vlc openshot gimp inkscape
|
||||
</code>
|
||||
|
||||
===== Office =====
|
||||
|
||||
<code>
|
||||
thunderbird thunderbird-i18n-de wqy-zenhei ttf-liberation libreoffice-fresh cups cups-pdf xsane system-config-printer kdeconnect firefox okular gwenview
|
||||
</code>
|
||||
|
||||
Wenn du ''cups'' installierst, müsst du auch den Dienst aktivieren:
|
||||
<code>
|
||||
systemctl enable --now cups.service
|
||||
</code>
|
||||
|
||||
===== Sonstige =====
|
||||
|
||||
<code>
|
||||
bash-completion cronie
|
||||
</code>
|
||||
|
||||
Füge für ''bash-complition'' folgendes zu deiner ''.bashrc'' hinzu:
|
||||
<code>
|
||||
echo "if [ -f /etc/bash_completion ]; then
|
||||
. /etc/bash_completion
|
||||
fi" >> ~/.bashrc
|
||||
</code>
|
||||
|
||||
Aktiviere service für ''cronie'':
|
||||
<code>
|
||||
systemctl enable --now cronie.service
|
||||
</code>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:desktop:environments: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:desktop:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:desktop:services: -sortAscending>
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
====== DNSCrypt ======
|
||||
|
||||
|
||||
===== Installiere auf dein Gerät =====
|
||||
|
||||
Folge dem [[https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Installation#os-specific-instructions|link]] und wähle dein Betriebssystem aus.
|
||||
|
||||
|
||||
===== Config file =====
|
||||
|
||||
Änder deine ''dnscrypt-proxy.toml'' Konfigurationsdatei.
|
||||
|
||||
|
||||
==== server_names ====
|
||||
|
||||
<code>
|
||||
server_names = ['techsaviours.org']
|
||||
</code>
|
||||
|
||||
|
||||
==== Sources ====
|
||||
|
||||
Deaktivieren alle
|
||||
|
||||
<code>
|
||||
[sources]
|
||||
</code>
|
||||
|
||||
|
||||
==== Anonymized DNS ====
|
||||
|
||||
Gehe nach unten zu ''routes = ['' und füge hinzu:
|
||||
|
||||
<code>
|
||||
routes = [
|
||||
{ server_name='2.dnscrypt-cert.techsaviours.org', via=['sdns://gRI0NS4xMzIuMjQ1Ljk1OjQ0MzQ'] }
|
||||
]
|
||||
</code>
|
||||
|
||||
|
||||
==== Static ====
|
||||
|
||||
Scrolle nach unten und füge den TECH **SAVIOURS** server in ''static'' und ''stamp'' hinzu:
|
||||
|
||||
<code>
|
||||
[static.'techsaviours.org']
|
||||
stamp = 'sdns://AQcAAAAAAAAAEjQ1LjEzMi4yNDUuOTU6NDQzNCAaKOG7s_XPRo0TVYMDCtgWPemMyDThFEe1os3q_As_UCAyLmRuc2NyeXB0LWNlcnQudGVjaHNhdmlvdXJzLm9yZw'
|
||||
</code>
|
||||
|
||||
Starte den Serivce neu oder verbinde den Client erneut.
|
||||
|
|
@ -0,0 +1 @@
|
|||
{{page>de:server:services:searx}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:extras: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
* [[de:wiki|WIKI]]
|
||||
* [[https://techsaviours.org/index-de.html|HOME]]
|
||||
* [[https://techsaviours.org/de/news|NEWS]]
|
||||
* [[https://techsaviours.org/index-de.html#services|WARUM?]]
|
||||
* [[https://techsaviours.org/index-de.html#tutorials|TUTORIALS]]
|
||||
* [[https://techsaviours.org/index-de.html#freeservices|SERVICES]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:phone: -noAddPageButton -sortAscending -sortDescending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:phone:apps: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:phone:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:server: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:server:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1,355 @@
|
|||
====== Arch Linux ======
|
||||
|
||||
Der Guide ist sowohl für Server als auch für Desktop geeignet.
|
||||
|
||||
Es umfasst:
|
||||
|
||||
**Server & Desktop**
|
||||
|
||||
* UEFI
|
||||
* systemd-boot
|
||||
* LVM on LUKS
|
||||
* NetworkManager
|
||||
* zram
|
||||
* doas
|
||||
* nftables
|
||||
|
||||
**Desktop**
|
||||
|
||||
* Xorg
|
||||
* KDE / Plasma
|
||||
* SDDM
|
||||
|
||||
===== ISO herunterladen =====
|
||||
|
||||
[[https://www.archlinux.org/download/]]
|
||||
|
||||
===== Erste Schritte =====
|
||||
|
||||
Wenn du eine deutsche Tastatur verwendest:
|
||||
|
||||
<code>
|
||||
ls /usr/share/kbd/keymaps/**/*.map.gz
|
||||
loadkeys de
|
||||
</code>
|
||||
|
||||
Prüfe, ob das System unter UEFI läuft::
|
||||
|
||||
<code>
|
||||
ls /sys/firmware/efi/efivars
|
||||
</code>
|
||||
|
||||
Bei Bedarf mit WLAN verbinden
|
||||
|
||||
<code>
|
||||
iwctl
|
||||
device list
|
||||
station DEVICE_NAME scan
|
||||
station DEVICE_NAME get-networks
|
||||
station DEVICE_NAME connect SSID
|
||||
</code>
|
||||
|
||||
NTP aktivieren und Zeitzone einstellen
|
||||
|
||||
<code>
|
||||
timedatectl set-ntp true
|
||||
timedatectl set-timezone Europe/Berlin
|
||||
</code>
|
||||
|
||||
Verbindung testen
|
||||
|
||||
<code>
|
||||
ping techsaviours.org -c 1
|
||||
</code>
|
||||
|
||||
===== Festplatte/n formatieren und Partitionen erstellen =====
|
||||
|
||||
Formatiere deine Festplatte/n und erstelle eine GPT-Tabelle.
|
||||
|
||||
<code>
|
||||
cfdisk /dev/sd*
|
||||
</code>
|
||||
|
||||
Typische Partitionen sehen wie folgt aus:
|
||||
^ Partitionen ^ Speicher | Art |
|
||||
| /dev/sda1 (boot) | 512M | EFI System |
|
||||
| /dev/sda2 (root) | xG | Linux Filesystem (ext4,...) |
|
||||
| /dev/sdb1 (home) (optional) | xG | Linux Filesystem (ext4,...) |
|
||||
|
||||
<alert type="info" icon="fa fa-info-circle">Optional kann die Home-Partition - ''/dev/sdb1'' - verwendet werden, wenn du eine andere Festplatte verwenden möchtest.</alert>
|
||||
|
||||
===== LVM on LUKS =====
|
||||
|
||||
==== Erstelle LUKS ====
|
||||
|
||||
**root**
|
||||
<code>
|
||||
cryptsetup luksFormat --type luks2 --cipher aes-xts-plain64 --key-size 512 /dev/sda2
|
||||
cryptsetup open /dev/sda2 root
|
||||
</code>
|
||||
|
||||
**home**
|
||||
(Optional) Zweite Festplatte (/dev/sdb1)
|
||||
|
||||
<code>
|
||||
cryptsetup luksFormat --type luks2 --cipher aes-xts-plain64 --key-size 512 /dev/sdb1
|
||||
cryptsetup open /dev/sdb1 home
|
||||
</code>
|
||||
|
||||
==== Erstelle LVM ====
|
||||
|
||||
=== Vorbereitung der Physical Volumes, Volume Groups und Logical Volumes ===
|
||||
|
||||
**root**
|
||||
<code>
|
||||
pvcreate /dev/mapper/root
|
||||
vgcreate vg0 /dev/mapper/root
|
||||
lvcreate -l 100%FREE vg0 -n root
|
||||
</code>
|
||||
|
||||
**home** (optional)
|
||||
|
||||
<code>
|
||||
pvcreate /dev/mapper/home
|
||||
vgcreate vg1 /dev/mapper/home
|
||||
lvcreate -l 100%FREE vg1 -n home
|
||||
</code>
|
||||
|
||||
=== Dateisysteme formatieren und mounten ===
|
||||
|
||||
**root**
|
||||
<code>
|
||||
mkfs.ext4 /dev/vg0/root
|
||||
mount /dev/vg0/root /mnt
|
||||
</code>
|
||||
|
||||
**boot**
|
||||
<code>
|
||||
mkfs.fat -F32 /dev/sda1
|
||||
mkdir /mnt/boot
|
||||
mount /dev/sda1 /mnt/boot
|
||||
</code>
|
||||
|
||||
**home** (optional)
|
||||
|
||||
<code>
|
||||
mkfs.ext4 /dev/vg1/home
|
||||
mkdir /mnt/home
|
||||
mount /dev/vg1/home /mnt/home
|
||||
</code>
|
||||
|
||||
===== Installiere die Basispakete =====
|
||||
|
||||
<code>
|
||||
pacstrap /mnt base base-devel linux-hardened linux-hardened-docs linux-hardened-headers linux-firmware nano networkmanager lvm2 opendoas openssh iptables-nft
|
||||
</code>
|
||||
|
||||
===== Konfigurierung des Systems =====
|
||||
|
||||
<code>
|
||||
genfstab -U /mnt > /mnt/etc/fstab
|
||||
arch-chroot /mnt
|
||||
</code>
|
||||
|
||||
==== Timezone ====
|
||||
|
||||
<code>
|
||||
ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
hwclock --systohc
|
||||
</code>
|
||||
|
||||
Unkommentiere deinen Standort. Zum Beispiel: //de_DE.UTF-8 UTF-8//
|
||||
|
||||
<code>
|
||||
nano /etc/locale.gen
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "LANG=de_DE.UTF-8
|
||||
LC_ADDRESS=de_DE.UTF-8
|
||||
LC_IDENTIFICATION=de_DE.UTF-8
|
||||
LC_MEASUREMENT=de_DE.UTF-8
|
||||
LC_MONETARY=de_DE.UTF-8
|
||||
LC_NAME=de_DE.UTF-8
|
||||
LC_NUMERIC=de_DE.UTF-8
|
||||
LC_PAPER=de_DE.UTF-8
|
||||
LC_TELEPHONE=de_DE.UTF-8
|
||||
LC_TIME=de_DE.UTF-8
|
||||
LC_ALL=de_DE.UTF-8" >> /etc/locale.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
locale-gen
|
||||
</code>
|
||||
|
||||
==== Tastaturlayout ====
|
||||
|
||||
<code>
|
||||
ls /usr/share/kbd/keymaps/**/*.map.gz
|
||||
nano /etc/vconsole.conf
|
||||
</code>
|
||||
<code>
|
||||
KEYMAP=YOUR_KEYBOARD
|
||||
</code>
|
||||
|
||||
==== Hostname ====
|
||||
|
||||
<code>
|
||||
echo "arch" > /etc/hostname
|
||||
</code>
|
||||
|
||||
|
||||
==== Host-Datei ====
|
||||
|
||||
<code>
|
||||
echo "127.0.0.1 localhost
|
||||
::1 localhost
|
||||
127.0.1.1 arch.localdomain arch" >> /etc/hosts
|
||||
</code>
|
||||
|
||||
==== root passwort ====
|
||||
<code>
|
||||
passwd
|
||||
</code>
|
||||
|
||||
==== Eine initiale Ramdisk erstellen ====
|
||||
|
||||
<code>
|
||||
nano /etc/mkinitcpio.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
HOOKS=(base udev autodetect keyboard keymap modconf block encrypt lvm2 filesystems fsck)
|
||||
</code>
|
||||
|
||||
<code>
|
||||
mkinitcpio -P
|
||||
</code>
|
||||
|
||||
==== Bootloader ====
|
||||
|
||||
<code>
|
||||
bootctl install
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "title Arch Linux
|
||||
linux /vmlinuz-linux-hardened
|
||||
initrd /initramfs-linux-hardened.img
|
||||
options cryptdevice=UUID=$(blkid -s UUID -o value /dev/sda2):root root=/dev/vg0/root rw" >> /boot/loader/entries/arch.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "title Arch Linux (fallback initramfs)
|
||||
linux /vmlinuz-linux-hardened
|
||||
initrd /initramfs-linux-hardened-fallback.img
|
||||
options cryptdevice=UUID=$(blkid -s UUID -o value /dev/sda2)=root root=/dev/vg0/root rw" >> /boot/loader/entries/arch-fallback.conf
|
||||
</code>
|
||||
|
||||
==== Microcode ====
|
||||
|
||||
Abhängig von deiner CPU - __//AMD//__ oder __//Intel//__ - wähle einer der folgenden Befehle aus:
|
||||
|
||||
<code>
|
||||
pacman -S intel-ucode
|
||||
</code>
|
||||
<code>
|
||||
pacman -S amd-ucode
|
||||
</code>
|
||||
|
||||
und füge ''initrd /**intel**-ucode.img'' oder ''initrd /**amd**-ucode.img'' über ''initrd /initramfs-linux-hardened.img'', ''initrd /initramfs-linux-hardened-**fallback**.img'' in ''/boot/loader/entries/arch.conf'' und ''/boot/loader/entries/arch-**fallback**.conf'' hinzu.
|
||||
|
||||
==== doas ====
|
||||
|
||||
Erlaubt Mitgliedern der Gruppe ''wheel'', Befehle auszuführen:
|
||||
|
||||
<code>
|
||||
echo "permit persist :wheel" >> /etc/doas.conf
|
||||
chown -c root:root /etc/doas.conf
|
||||
chmod -c 0400 /etc/doas.conf
|
||||
</code>
|
||||
|
||||
<alert type="danger" icon="fa fa-warning">Das ''persist''-Feature ist standardmäßig deaktiviert [....] Dieses Feature ist neu und potentiell gefährlich, im Original-Doas wird eine Kernel-API zum Setzen und Löschen von Timeouts verwendet. Diese API ist openbsd-spezifisch und es gibt keine ähnliche API auf anderen Betriebssystemen.
|
||||
</alert>
|
||||
|
||||
=== Sudo Benutzer? ===
|
||||
|
||||
<code>
|
||||
pacman -Rsn opendoas
|
||||
pacman -S sudo
|
||||
</code>
|
||||
|
||||
oder
|
||||
<code>
|
||||
echo "alias sudo='doas'
|
||||
alias sudoedit='doas rnano'" >> ~/.bashrc
|
||||
</code>
|
||||
|
||||
==== Benutzer hinzufügen ====
|
||||
|
||||
Ändere ''USER'' mit deinen Namen.
|
||||
|
||||
<code>
|
||||
useradd -m -G wheel -s /bin/bash USER
|
||||
passwd USER
|
||||
</code>
|
||||
|
||||
==== zram ====
|
||||
|
||||
|
||||
=== Module ===
|
||||
|
||||
<code>
|
||||
echo "zram" >> /etc/modules-load.d/zram.conf
|
||||
</code>
|
||||
|
||||
=== Modprobe ===
|
||||
|
||||
<code>
|
||||
echo "options zram num_devices=1" >> /etc/modprobe.d/zram.conf
|
||||
</code>
|
||||
|
||||
=== Udev ===
|
||||
|
||||
<code>
|
||||
echo 'KERNEL=="zram0", ATTR{disksize}="4GB" RUN="/usr/bin/mkswap /dev/zram0", TAG+="systemd"' >> /etc/udev/rules.d/99-zram.rules
|
||||
</code>
|
||||
|
||||
=== Fstab ===
|
||||
|
||||
<code>
|
||||
echo "# swap
|
||||
/dev/zram0 none swap defaults 0 0
|
||||
" >> /etc/fstab
|
||||
</code>
|
||||
|
||||
==== Services aktivieren ====
|
||||
|
||||
<code>
|
||||
systemctl enable --now NetworkManager.service
|
||||
systemctl enable --now sshd.service
|
||||
</code>
|
||||
|
||||
==== (Optional) Schlüssel für die Home-Partition hinzufügen ====
|
||||
|
||||
Wenn du dich entschieden hast, eine zusätzliche Partition oder ein zusätzliches Laufwerk zu verwenden, kannst du auch einen Schlüssel verwenden, anstatt die Passphrase immer wieder einzugeben. Auf diese Weise muss nur noch für root die Passphrase eingeben.
|
||||
|
||||
<code>
|
||||
mkdir /etc/luks-keys/
|
||||
dd bs=512 count=4 if=/dev/urandom of=/etc/luks-keys/home.bin
|
||||
chmod -cR 0400 /etc/luks-keys/
|
||||
cryptsetup luksAddKey /dev/sdb1 /etc/luks-keys/home.bin
|
||||
echo "home /dev/sdb1 /etc/luks-keys/home.bin" >> /etc/crypttab
|
||||
</code>
|
||||
|
||||
==== Reboot ====
|
||||
|
||||
<code>
|
||||
exit
|
||||
</code>
|
||||
<code>
|
||||
umount -R /mnt
|
||||
reboot
|
||||
</code>
|
||||
|
||||
<alert type="info">Herzlichen Glückwunsch 🍻 Der Serverteil ist erledigt! Fahre mit [[de:desktop:environments:kde|KDE]] fort, wenn du eine Desktop-Umgebung installieren möchtest.</alert>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:server:services: -sortAscending>
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
====== Searx ======
|
||||
|
||||
Nur für Linux-Systeme verfügbar!
|
||||
|
||||
===== Programme =====
|
||||
|
||||
==== Ubuntu / Debian ====
|
||||
|
||||
<code>
|
||||
sudo -H apt-get install -y \
|
||||
virtualenv python3-dev python3-babel python3-venv \
|
||||
uwsgi uwsgi-plugin-python3 \
|
||||
git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev \
|
||||
shellcheck
|
||||
</code>
|
||||
|
||||
==== Arch Linux ====
|
||||
|
||||
<code>
|
||||
sudo -H pacman -S --noconfirm \
|
||||
python-virtualenv python python-pip python-lxml python-babel \
|
||||
uwsgi uwsgi-plugin-python \
|
||||
git base-devel libxml2 \
|
||||
shellcheck
|
||||
</code>
|
||||
|
||||
==== Fedora / RHEL ====
|
||||
|
||||
<code>
|
||||
sudo -H dnf install -y \
|
||||
virtualenv python python-pip python-lxml python-babel \
|
||||
uwsgi uwsgi-plugin-python3 \
|
||||
git @development-tools libxml2 \
|
||||
ShellCheck
|
||||
</code>
|
||||
|
||||
===== Benutzer Erstellen =====
|
||||
|
||||
<code>
|
||||
sudo -H useradd --shell /bin/bash --system \
|
||||
--home-dir /usr/local/searx \
|
||||
--comment Privacy-respecting metasearch engine searx
|
||||
|
||||
sudo -H mkdir /usr/local/searx
|
||||
sudo -H chown -R searx:searx /usr/local/searx
|
||||
</code>
|
||||
|
||||
===== Searx-Abhängigkeiten (searx benutzer/terminal) =====
|
||||
|
||||
<code>
|
||||
sudo -H -u searx -i
|
||||
git clone https://github.com/asciimoo/searx.git /usr/local/searx/searx-srcx
|
||||
</code>
|
||||
|
||||
===== Virtuelle Umgebung Erstellen (searx benutzer/terminal) =====
|
||||
|
||||
<code>
|
||||
python3 -m venv /usr/local/searx/searx-pyenv
|
||||
echo . /usr/local/searx/searx-pyenv/bin/activate >> /usr/local/searx/.profile
|
||||
</code>
|
||||
|
||||
===== Starte ein weiteres Terminal (update) =====
|
||||
|
||||
<code>
|
||||
pip install -U pip
|
||||
pip install -U setuptools
|
||||
pip install -U wheel
|
||||
</code>
|
||||
|
||||
===== Searx in virtuelle Umgebung installieren (back to searx benutzer/terminal) =====
|
||||
|
||||
<code>
|
||||
cd /usr/local/searx/searx-src
|
||||
pip install -e .
|
||||
</code>
|
||||
|
||||
===== Konfiguration =====
|
||||
|
||||
<code>
|
||||
sudo -H cp /usr/local/searx/searx-src/searx/settings.yml /etc/searx/settings.yml
|
||||
sudo -H sed -i -e s/ultrasecretkey/\9873266d1c899b68f21ca049ae5e5d93/g /etc/searx/settings.yml
|
||||
sudo -H sed -i -e s/{instance_name}/searx@\ryzen/g /etc/searx/settings.yml
|
||||
</code>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
~~NOCACHE~~
|
||||
|
||||
=== Tutorials ===
|
||||
* [[:de:server|Server]]
|
||||
* [[:de:server:operating_systems|Betriebssysteme]]
|
||||
* [[:de:server:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:de:server:services|Services]]
|
||||
* [[:de:server:services:searx|Searx]]
|
||||
* [[:de:phone|Phone]]
|
||||
* [[:de:phone:operating_systems|Betriebssysteme]]
|
||||
* [[:de:phone:operating_systems:android|Android]]
|
||||
* [[:de:phone:apps|Apps]]
|
||||
* [[:de:phone:apps:magisk|Magisk]]
|
||||
* [[:de:desktop|Desktop]]
|
||||
* [[:de:desktop:operating_systems|Betriebssysteme]]
|
||||
* [[:de:desktop:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:de:desktop:environments|Umgebung]]
|
||||
* [[:de:desktop:environments:kde|KDE]]
|
||||
* [[:de:desktop:services|Services]]
|
||||
* [[:de:desktop:services:dnscrypt|DNSCrypt]]
|
||||
* [[:de:desktop:services:searx|Searx]]
|
||||
* [[:de:backup|Backup]]
|
||||
* [[:de:backup:server|Server]]
|
||||
* [[:de:backup:phone|Phone]]
|
||||
* [[:de:backup:desktop|Desktop]]
|
||||
* [[:de:extras|Extras]]
|
||||
* [[:de:vulnerability_scans|Vulnerability Scans]]
|
||||
* [[:de:vulnerability_scans:log4shell|Log4shell]]
|
||||
* [[:de:faq|FAQ]]
|
||||
|
||||
=== Mitwirken ===
|
||||
* [[:de:wiki:wikirules|Zur Wiki beitragen]]
|
||||
|
||||
=== Sonstiges ===
|
||||
* [[:de:wiki:dokuwiki|Über DokuWiki]]
|
||||
* [[:de:wiki:syntax|DokuWiki syntax]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:vulnerability-scans: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist de:vulnerability_scans: -sortAscending>
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
====== Log4shell ======
|
||||
|
||||
Am 9. Dezember 2021 veröffentlichte Apache eine schwerwiegende Sicherheitslücke namens [[https://nvd.nist.gov/vuln/detail/CVE-2021-44228|Log4shell]] (und andere Log4j-bezogene Sicherheitslücken).
|
||||
|
||||
===== Download =====
|
||||
|
||||
Wie man seine Dienste schnell scannt, grundsätzlich mit log4j-scan von fullhunt, aber unter Verwendung von cisagov:
|
||||
<code>
|
||||
git clone https://github.com/cisagov/log4j-scanner.git
|
||||
cd log4-scanner/
|
||||
</code>
|
||||
|
||||
==== Anforderungen ====
|
||||
|
||||
* python
|
||||
* python-requests
|
||||
* python-termcolor
|
||||
* python-pycryptodome
|
||||
|
||||
|
||||
===== URL-Liste erstellen =====
|
||||
|
||||
Am einfachsten ist es, eine Liste aller URLs zu erstellen, die du überprüfen möchtest:
|
||||
<code>
|
||||
nano urls.txt
|
||||
</code>
|
||||
<code>
|
||||
https://techsaviours.org
|
||||
https://meet.techsaviours.org
|
||||
https://searx.techsaviours.org
|
||||
</code>
|
||||
|
||||
===== Überprüfe deine Urls =====
|
||||
|
||||
<code>
|
||||
python log4j-scan.py -l urls.txt --waf-bypass --run-all-tests
|
||||
</code>
|
||||
|
||||
oder nur eine Url
|
||||
|
||||
<code>
|
||||
python log4j-scan.py -u https://techsaviours.org --waf-bypass --run-all-tests
|
||||
</code>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<alert type="success" icon="fa fa-info-circle">**Arch Linux** & **KDE** __tutorial__ ist fertig 🍻 Siehe [[de/server/operating_systems/arch_linux|hier]]!</alert>
|
||||
|
||||
====== Willkommen bei TECH SAVIOURS Wiki ======
|
||||
Wir möchten dir hier die Möglichkeit geben, deine digitale Datenschutzziele als DIY-Lösung zu realisieren. Wir decken die wichtigsten Geräte ab, die wir jeden Tag benutzen.
|
||||
|
||||
Folge einfach den Tutorials, um deine digitale Privatsphäre in den Griff zu bekommen und nur das zu teilen, was du wirklich teilen willst.
|
||||
|
||||
====== Contributing ======
|
||||
Wenn du daran interessiert bist, weitere Geräte hinzuzufügen oder einige Verbesserungen vorzunehmen, sieh dir unsere [[de:wiki:wikirules|wiki rules]] an.
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
====== DokuWiki ======
|
||||
|
||||
{{:wiki:dokuwiki-128.png?nolink&100 }}
|
||||
|
||||
**DokuWiki** ist eine standardkonforme, einfach zu verwendende und zugleich äußerst vielseitige Open Source [[wpde>Wiki-Software]]. Die Anwendung nutzt einfache Textdateien zur Speicherung der Inhalte und benötigt insofern keine Datenbank. Der integrierte [[https://www.dokuwiki.org/plugin:config|Konfigurations-Manager]] erlaubt es, Einstellungen direkt über eine anwenderfreundliche Web-Oberfläche vorzunehmen.
|
||||
|
||||
//Benutzer// schätzen DokuWiki insbesondere aufgrund der einprägsamen und leicht lesbaren [[de:wiki:Syntax]]. Diese gewährleistet, dass die Daten auch außerhalb des Wikis lesbar bleiben und vereinfacht die Erstellung strukturierter Texte. //Administratoren// favorisieren es aufgrund seiner einfachen Wartung, Sicherung, sowie Integration. Dank integrierter [[https://www.dokuwiki.org/de:acl|Zugriffskontrolle]] ist es insbesondere auch für den Einsatz im Unternehmensumfeld geeignet.
|
||||
|
||||
Darüber hinaus ermöglicht eine große Anzahl, seitens einer lebendigen [[https://www.dokuwiki.orgde:teams:getting_involved|Community]] bereitgestellter [[https://www.dokuwiki.org/de:plugins|Plugins]] und [[https://www.dokuwiki.org/de:templates|Templates]] eine weitaus breitere Palette von Anwendungsmöglichkeiten, welche die eines herkömmlichen Wikis bei weitem übersteigen.
|
||||
|
||||
Überzeug dich selbst: [[http://download.dokuwiki.org|{{:marketing:download-big.png|Download der aktuellen version}}]]
|
||||
|
||||
----
|
||||
|
||||
===== Mehr Information =====
|
||||
|
||||
Die gesamte **Dokumentation** und weitere Informationen findest du hier bei [[doku>dokuwiki|www.dokuwiki.org]]. Einige Seiten sind bislang nur in englischer Sprache verfügbar.
|
||||
|
||||
**Über DokuWiki**
|
||||
|
||||
* [[doku>de:features|Eigenschaften & Funktionen]] :!:
|
||||
* [[doku>dokuinstall|Glückliche Anwender]]
|
||||
* [[doku>press|Wer darüber schrieb (en)]]
|
||||
* [[doku>blogroll|Was Blogger denken (en)]]
|
||||
* [[http://www.wikimatrix.org/show/DokuWiki|Vergleich mit anderen Wiki-Systemen]]
|
||||
|
||||
**DokuWiki installieren**
|
||||
|
||||
* [[doku>de:requirements|Systemvoraussetzungen]]
|
||||
* [[http://download.dokuwiki.org/|DokuWiki herunterladen (en)]] :!:
|
||||
* [[doku>changes|Änderungs-Logbuch (en)]]
|
||||
* [[doku>de:Install|Installation]] :!:
|
||||
* [[doku>config|Konfiguration (en)]]
|
||||
|
||||
**DokuWiki anwenden**
|
||||
|
||||
* [[doku>de:syntax|Wiki Syntax]]
|
||||
* [[doku>de:manual|Das Handbuch]] :!:
|
||||
* [[doku>de:FAQ|Häufig gestellte Fragen (FAQ)]]
|
||||
* [[doku>glossary|Glossar (en)]]
|
||||
|
||||
**DokuWiki personalisieren**
|
||||
|
||||
* [[doku>de:tips|Tipps und Tricks]]
|
||||
* [[doku>de:template|Templates erstellen und verwenden]]
|
||||
* [[doku>de:plugins|Plugins installieren]]
|
||||
* [[doku>development|Entwicklungsressourcen (en)]]
|
||||
|
||||
**DokuWiki Feedback und Community**
|
||||
|
||||
* [[doku>mailinglist|Der Mailing-Liste beitreten (en)]] :!:
|
||||
* [[doku>de:forum|Diskutiere mit anderen Benutzern im Forum]]
|
||||
* [[doku>de:irc|Rede mit anderen Anwendern im IRC-Kanal]]
|
||||
* [[https://github.com/splitbrain/dokuwiki/issues|Bugs und gewünschte Funktionen mitteilen (en)]]
|
||||
* [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Teile deine Erfahrungen im WikiMatrix-Forum mit (en)]]
|
||||
* [[doku>thanks|Demütige Danksagungen (en)]]
|
||||
|
||||
===== Urheberrecht =====
|
||||
|
||||
2004--2021 (c) Andreas Gohr <andi@splitbrain.org>((Bitte nicht für Hilfe und Unterstützung kontaktieren -- stattdessen die [[doku>mailinglist|mailinglist]] oder das [[http://forum.dokuwiki.org|Forum]] benutzen))
|
||||
|
||||
Die DokuWiki Programmlogik ist unter der [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2 veröffentlicht. Wenn Sie DokuWiki in Ihrem Unternehmen einsetzen, bedenken Sie den Entwickler mit einer kleinen Spende via [[https://www.paypal.com/xclick/business=andi%40splitbrain.org&item_name=DokuWiki+Donation&no_shipping=1&no_note=1&tax=0&currency_code=EUR&lc=US|PayPal]] ;-).
|
||||
|
||||
Die Inhalte im DokuWiki auf https://www.dokuwiki.org/dokuwiki/ stehen unter der [[http://creativecommons.org/licenses/by-nc-sa/2.0/|Creative Commons Attribution-NonCommercial-ShareAlike License]] Version 2.0.
|
||||
|
||||
Eine Ausnahme bildet der Inhalt, der mit im Archiv heruntergeladen wird((Dateien innerhalb des ''data'' Verzeichnisses -- z.B.: ''dokuwiki.txt'', ''syntax.txt'', ''dokuwiki-128.png'')), die aus Kompatibilitätsgründen ebenfalls unter der GNU General Public License Version 2 stehen.
|
||||
|
||||
Sie sind nicht sicher, was das bedeutet? Siehe [[doku>de:faq:license|FAQ zur Lizenzierung]].
|
||||
|
|
@ -0,0 +1,511 @@
|
|||
====== Syntax ======
|
||||
|
||||
[[DokuWiki]] zeichnet sich u. a. durch einfache Textformatierungen aus. Dadurch bleiben die Dateien, die den Inhalt enthalten, gut lesbar.
|
||||
In den nachfolgenden Abschnitten sind die möglichen Formatierungsarten aufgelistet, die innerhalb des Editors verwendet werden können. Einige der hier vorgestellten Formatierungen sind auch direkt über die [[doku>de:toolbar|Quickbuttons]] erreichbar.
|
||||
Ein erstes Beispiel, wie der Aufbau einer Seite aussehen kann, findest du, wenn du dir diese Seite im Quelltext-Modus anzeigen lässt. Klicke dazu auf den Button "Vorschau".
|
||||
|
||||
Zum Ausprobieren oder Üben kann die [[playground:playground|Spielwiese]] verwendet werden.
|
||||
|
||||
|
||||
====== 1 Texte ======
|
||||
===== 1.1 Formatierungen =====
|
||||
|
||||
DokuWiki unterstützt **fetten**, //kursiven//, __unterstrichenen__ und ''dicktengleichen'' ([[wpde>Dickte|Dickte]]) Text. Natürlich kann auch alles **__//''kombiniert''//__** werden.
|
||||
|
||||
DokuWiki unterstützt **fetten**, //kursiven//, __unterstrichenen__ und ''dicktengleichen'' Text.
|
||||
Natürlich kann auch alles **__//''kombiniert''//__** werden.
|
||||
|
||||
Ebenso gibt es <sub>tiefgestellten</sub> und <sup>hochgestellten</sup> Text.
|
||||
|
||||
Ebenso gibt es <sub>tiefgestellten</sub> und <sup>hochgestellten</sup> Text.
|
||||
|
||||
Text kann als <del>gelöscht</del>((wer das Tag "eingefügt" (%%<ins>%%) benötigt. kann dies über Plugins realisieren. Siehe ganz unten!)) markiert werden.
|
||||
|
||||
Text kann als <del>gelöscht</del> markiert werden.
|
||||
|
||||
===== 1.2 Absätze =====
|
||||
|
||||
Ein Absatz wird durch eine leere Zeile erzeugt. Eine neue Zeile (Zeilenumbruch) kann durch zwei "Backslashes" (umgekehrte Schrägstriche: %%\\%%) gefolgt von einem Leerzeichen erzeugt werden.
|
||||
|
||||
Dies ist ein Beispieltext mit einigen Zeilenumbrüchen.\\ Beachte: Die zwei umgekehrten Schrägstriche
|
||||
werden nur erkannt, wenn sie am Zeilenende stehen\\
|
||||
oder wenn ihnen ein\\ Leerzeichen folgt.\\ So\\sieht es ohne Leerzeichen aus.
|
||||
|
||||
Dies ist ein Beispieltext mit einigen Zeilenumbrüchen.\\ Beachte: Die zwei umgekehrten Schrägstriche
|
||||
werden nur erkannt, wenn sie am Zeilenende stehen\\
|
||||
oder wenn ihnen ein\\ Leerzeichen folgt.\\ So\\sieht es ohne Leerzeichen aus.
|
||||
|
||||
Zeilenumbrüche durch zwei "Backslashes" (umgekehrte Schrägstriche: %%\\%%) sollten nur verwendet werden, wenn sie unbedingt notwendig sind.
|
||||
|
||||
===== 1.3 Überschriften =====
|
||||
Mit fünf unterschiedlichen Ebenen, getrennt durch Überschriften, kann der Inhalt einer Seite strukturiert werden.
|
||||
Die Überschriften werden mit maximal sechs "=" eingerahmt, je nach Größe. H1 ist die Überschrift auf höchster Ebene. Am einfachsten ist es zur Erzeugung der Überschriften, die Symbolleiste zu verwenden. Das Einfügen der Überschriften erfolgt über die Buttons, die ein "H" anzeigen.
|
||||
|
||||
Es ist __sinnvoll__, wenn immer eine Level 1 Überschrift am Anfang eines Artikels steht.
|
||||
|
||||
Wenn in einer Seite mehr als drei Überschriften vorkommen, wird automatisch ein Inhaltsverzeichnis erstellt, welches alle Überschriften auflistet.
|
||||
Soll dieses Inhaltsverzeichnis nicht erstellt werden, muss der Befehl: ''<nowiki>~~NOTOC~~</nowiki>'' mit in die Seite aufgenommen werden.
|
||||
|
||||
====== Überschrift Ebene 1 ======
|
||||
===== Überschrift Ebene 2 =====
|
||||
==== Überschrift Ebene 3 ====
|
||||
=== Überschrift Ebene 4 ===
|
||||
== Überschrift Ebene 5 ==
|
||||
|
||||
Innerhalb von Überschriften können standardmäßig keine weiteren Formatierungen vorgenommen werden! (s. [[faq:headerlinks|FAQ - Headerlinks]])
|
||||
|
||||
===== 1.4 unformatierte Abschnitte =====
|
||||
|
||||
Um Text so anzuzeigen, wie er geschrieben wurde, egal ob er DokuWiki Formatierungen oder andere Formatierungen enthält, kann man jede
|
||||
Zeile mit zwei Leerzeichen beginnen (so wie es in dieser Seite angewendet wurde) oder einen der Bezeichner "code" bzw. "file" benutzen:
|
||||
|
||||
<code>
|
||||
Mit "code": In diesem Text werden keine überflüssigen Leerzeichen entfernt: wie hier <-- zwischen
|
||||
</code>
|
||||
|
||||
|
||||
<file plain Beispiel.txt>
|
||||
Mit dem Bezeichner "file" kann ein bestimmter Abschnitt als einzelner Bestandteil
|
||||
auf einer Seite zum Download angeboten werden.
|
||||
</file>
|
||||
|
||||
Innerhalb von "file" ist auch die im Abschnitt weiter unten beschriebene [[#Syntax-Hervorhebung|Syntax-Hervorhebung]] aktivierbar.
|
||||
|
||||
<file perl HelloWorld.pl>
|
||||
#!/usr/bin/perl
|
||||
print "Hello World!\n";
|
||||
</file>
|
||||
|
||||
<file perl HelloWorld.pl>
|
||||
#!/usr/bin/perl
|
||||
print "Hello World!\n";
|
||||
</file>
|
||||
|
||||
Um jegliche Umwandlung durch DokuWiki abzustellen, umschließe den entsprechenden Bereich mit "nowiki" Bezeichnern oder kürzer mit doppelten Prozentzeichen ''<nowiki>%%</nowiki>''.
|
||||
|
||||
<nowiki>
|
||||
Dieser Text enthält Links wie: http://www.splitbrain.org und **Formatierungen** aber sie werden nicht umgesetzt und erscheinen als normaler Text.
|
||||
</nowiki>
|
||||
|
||||
%%Dieser Text ist nun mit %%''<nowiki>%%</nowiki>''%% markiert und hat die gleiche Wirkung wie "nowiki".
|
||||
|
||||
"Dieser Text enthält links wie: http://www.splitbrain.org und **Formatierungen** aber sie werden nicht umgesetzt und erscheinen als normaler Text."%%
|
||||
|
||||
Einfach den Quelltext dieser Seite anschauen (den Knopf "Edit" drücken) um zu sehen, wie diese Blöcke angewendet werden.
|
||||
|
||||
===== 1.5 Syntax-Hervorhebung =====
|
||||
|
||||
[[DokuWiki]] kennt Syntax-Highlighting für Quellcode, um dessen Lesbarkeit zu erhöhen. Dafür wird [[http://qbnz.com/highlighter/|GeSHi]] "**Ge**neric **S**yntax **Hi**ghlighter" benutzt. Somit wird jede Programmiersprache unterstützt, die GeSHi kennt.
|
||||
Es wird der gleiche Bezeichner wie im vorherigen Abschnitt benutzt, nur dass er nun auch den Namen der Sprache enthält:
|
||||
''<nowiki><code java> Quelltext </code></nowiki>''
|
||||
|
||||
<code java>
|
||||
/**
|
||||
* The HelloWorldApp class implements an application that
|
||||
* simply displays "Hello World!" to the standard output.
|
||||
*/
|
||||
class HelloWorldApp {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World!"); //Display the string.
|
||||
}
|
||||
}
|
||||
</code>
|
||||
|
||||
Es werden folgende Sprachen unterstützt: //actionscript, actionscript-french, ada, apache, applescript, asm, asp, bash, caddcl, cadlisp, **c**, c_mac, cpp, csharp, css, **delphi**, diff, d, div, dos, eiffel, freebasic, gml, html4strict, ini, inno, **java**, javascript, lisp, lua, matlab, mpasm, nsis, objc, ocaml, ocaml-brief, oobas, oracle8, pascal, perl, php-brief, **php**, python, qbasic, scheme, sdlbasic, smarty, **sql**, ruby, vb, vbnet, vhdl, visualfoxpro, **xml**//
|
||||
|
||||
===== 1.6 Zitat / Kommentar =====
|
||||
Um einen Text als Zitat oder Kommentar zu kennzeichnen, wird das "größer als" - Zeichen folgendermaßen verwendet:
|
||||
|
||||
Ich denke wir sollten es tun.
|
||||
|
||||
> Nein, sollten wir nicht.
|
||||
|
||||
>> Doch!
|
||||
|
||||
> Wirklich?
|
||||
|
||||
>> Ja!
|
||||
|
||||
>>> Dann lass es uns tun!
|
||||
|
||||
>>> Kommentare oder Zitate können auch über mehrere Zeilen gehen, wie dieser völlig unsinnige Text zeigt. Um einen Text als Zitat oder Kommentar zu kennzeichnen, wird das "größer als"-Zeichen folgendermaßen verwendet
|
||||
|
||||
Ich denke wir sollten es tun
|
||||
|
||||
> Nein, sollten wir nicht.
|
||||
|
||||
>> Doch!
|
||||
|
||||
> Wirklich?
|
||||
|
||||
>> Ja!
|
||||
|
||||
>>> Dann lass es uns tun
|
||||
|
||||
>>> Kommentare oder Zitate können auch über mehrere Zeilen gehen, wie dieser völlig unsinnige Text zeigt. Um einen Text als Zitat oder Kommentar zu kennzeichnen, wird das "größer als"-Zeichen folgendermaßen verwendet
|
||||
|
||||
===== 1.7 Escapezeichen =====
|
||||
Will man verhindern, dass DokuWiki irgendwelche Formatierungen am bzw. Umwandlungen im Text vornimmt so kann man die Prozentzeichen benutzen
|
||||
<code>%%[[wiki:testseite|Testseite]]%%</code>
|
||||
Die Ausgabe würde dann folgendermaßen aussehen %%[[wiki:testseite|Testseite]]%%
|
||||
|
||||
===== 1.8 Fußnoten =====
|
||||
|
||||
Fußnoten ((dies ist eine Fußnote)) werden durch eine doppelte runde Klammer dargestellt ((eine zweite Fußnote)). Der Text zwischen den Klammern wird an das Ende der Seite geschrieben. Die Reihenfolge und somit die Nummerierung übernimmt DokuWiki.
|
||||
|
||||
Fußnoten ((dies ist eine Fußnote)) werden durch eine doppelte runde Klammer dargestellt ((eine zweite Fußnote))
|
||||
|
||||
===== 1.9 Linien =====
|
||||
|
||||
Durch vier oder mehr Bindestriche bzw. Minuszeichen "-" wird eine horizontale Linie erzeugt:
|
||||
-----
|
||||
|
||||
|
||||
|
||||
|
||||
====== 2 Links ======
|
||||
|
||||
Mit DokuWiki können fünf unterschiedliche Arten von Links benutzt werden:
|
||||
|
||||
===== 2.1 Extern =====
|
||||
|
||||
Externe Links (Verweise auf andere Webseiten oder Dateien) werden automatisch erkannt: http://www.google.com oder einfach www.google.com.
|
||||
Verweise können auch hinter eigenen Begriffen versteckt werden: [[http://www.google.com|hier ist google]].
|
||||
E-Mail Adressen werden in spitze Klammern gesetzt: <andi@splitbrain.org>.
|
||||
|
||||
Externe Links werden automatisch erkannt: http://www.google.com oder einfach www.google.com.
|
||||
Verweise können auch hinter eigenen Begriffen versteckt werden: [[http://www.google.com|hier ist google]].
|
||||
E-Mail Adressen werden in spitze Klammern gesetzt: <andi@splitbrain.org>.
|
||||
|
||||
===== 2.2 Intern =====
|
||||
|
||||
Interne Links, also Verweise auf Seiten innerhalb von DokuWiki, werden in doppelten eckigen Klammern gesetzt ("Alt Gr+8" bzw. Alt Gr+9 unter Windows bzw. Wahltaste+5 und Wahltaste+6 bei Apple-Betriebssystemen):
|
||||
[[doku>pagename]]
|
||||
|
||||
Ein Link kann auch hinter einem Begriff oder einer Beschreibung versteckt werden:
|
||||
[[pagename|Beschreibung für einen Link]].
|
||||
|
||||
Interne Links werden in doppelten eckigen Klammern gesetzt:
|
||||
[[pagename]]
|
||||
|
||||
Ein Link kann auch hinter einem Begriff oder einer Beschreibung versteckt werden:
|
||||
[[pagename|Beschreibung für einen Link]].
|
||||
|
||||
Dateinamen für neue Seiten im Wiki werden automatisch in Kleinbuchstaben umgewandelt!
|
||||
Umlaute sind genauso wie Sonderzeichen nicht erlaubt!
|
||||
|
||||
Durch einen Doppelpunkt werden Namensbereiche im Wiki aufgelöst: [[de:namespaces]]
|
||||
|
||||
Durch einen Doppelpunkt werden Namensbereiche im Wiki aufgelöst:[[de:namespaces]]
|
||||
|
||||
Weitere Informationen zu Namensbereichen: [[doku>de:namespaces]].
|
||||
|
||||
Die Verlinkung zu einem speziellen Abschnitt innerhalb des Dokuments (Anker) ist auch möglich. Der Abschnittsnamen wird getrennt durch ein Doppelkreuz (#) an den Seitennamen gehängt.
|
||||
|
||||
Dieses Beispiel verlinkt zu [[de:wiki:syntax#intern|diesem Abschnitt]].
|
||||
|
||||
Dieses Beispiel verlinkt zu [[de:wiki:syntax#intern|diesem Abschnitt]].
|
||||
|
||||
|
||||
Anmerkungen:
|
||||
|
||||
* Links zu [[syntax|existierenden Seiten]] werden anders angezeigt als Links zu [[nicht-existierenden]] Seiten.
|
||||
* DokuWiki verwendet standardmäßig keine [[wpde>CamelCase]] für Links. In der Einstellungsdatei: [[doku>config]] kann das aber geändert werden. **Hinweis**: wenn das Wort "DokuWiki" als Link angezeigt wird, dann ist diese Option eingeschaltet.
|
||||
* Ändert sich eine Überschrift im Zieldokument, führt der Anker ins Leere ohne dass der Link dabei als fehlerhaft angezeigt wird.
|
||||
* Anker werden klein geschrieben, es werden Leerzeichen mit Unterstrichen und Umlaute mit ihren Umschreibungen (ä = ae) verwendet.
|
||||
|
||||
===== 2.3 Interwiki =====
|
||||
|
||||
DokuWiki unterstützt auch Links in andere Wikis, sogenannte [[doku>de:interwiki]] Links.
|
||||
Ein Link zur Wikipedia Seite über Wikis:[[wpde>Wiki]]
|
||||
|
||||
DokuWiki unterstützt auch Links in andere Wikis, sogenannte [[doku>de:interwiki]] Links.
|
||||
Ein Link zur Wikipedia Seite über Wikis:[[wpde>Wiki]]
|
||||
|
||||
===== 2.4 Windows-Freigaben =====
|
||||
|
||||
DokuWiki kennt auch Links auf Windows-Freigaben: [[\\server\freigabe|freigegebener-Ordner]].
|
||||
Dies ist allerdings nur in einer homogenen Benutzergruppe sinnvoll (siehe [[wpde>Intranet]]).
|
||||
|
||||
[[\\server\freigabe|this]].
|
||||
|
||||
Hinweis:
|
||||
* Aus Sicherheitsgründen funktioniert direktes Navigieren durch die Freigaben standardmäßig nur mit dem Internet Explorer (und das nur in der "lokalen Zone")!
|
||||
* Für Mozilla und Firefox kann es durch die Option [[http://www.mozilla.org/quality/networking/docs/netprefs.html#file|security.checkloaduri]] eingeschaltet werden, was aber nicht empfohlen wird! (Weitere Informationen: [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Links to local pages do not work]])
|
||||
* Opera ignoriert als Sicherheitsfeature seit [[http://www.opera.com/windows/changelogs/754/|Version 7.54]] alle Links auf //file:// in Webseiten.
|
||||
* Für weitere Informationen siehe: [[bug>151]]
|
||||
|
||||
===== 2.5 Bilder als Links =====
|
||||
|
||||
Bilder können für einen Link auf eine interne oder externe Datei verwendet werden. Dazu wird die Syntax zur Anzeige von Links einfach mit der zur Anzeige von Bildern (siehe unten) kombiniert:
|
||||
|
||||
[[http://www.php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
[[http://www.php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
Bitte beachte: Bildformatierungen sind die einzigen Formatierungen, die in Linknamen benutzt werden können!
|
||||
|
||||
====== 3 Bilder und andere Dateien ======
|
||||
|
||||
===== 3.1 Bilder im DokuWiki speichern =====
|
||||
|
||||
Um Bilder im DokuWiki speichern zu dürfen, muss der Benutzer die entsprechende Berechtigung besitzen ([[de:acl|ACL]]). Zum Hochladen ist mindestens die Berechtigung "Hochladen" (engl. "Upload"), zum Löschen "Entfernen" (engl. "Delete") für den [[de:namespaces|Namensraum]] erforderlich.
|
||||
|
||||
===== 3.2 Größe von Bildern =====
|
||||
Mit geschweiften Klammern können sowohl externe als auch interne [[doku>images|Bilder]] eingebunden werden. Das Bild heißt in diesem Beispiel "dokuwiki-128.png". Optional kann deren Größe angegeben werden:
|
||||
|
||||
Originalgröße: {{wiki:dokuwiki-128.png}}
|
||||
|
||||
Eine Breite vorgeben: {{wiki:dokuwiki-128.png?50}}
|
||||
|
||||
Breite und Höhe vorgeben: {{wiki:dokuwiki-128.png?200x50}}
|
||||
|
||||
Größe für externe Bilder vorgeben: {{http://de3.php.net/images/php.gif?200x50}}
|
||||
|
||||
Originalgröße: {{wiki:dokuwiki-128.png}}
|
||||
Eine Breite vorgeben: {{wiki:dokuwiki-128.png?50}}
|
||||
Breite und Höhe vorgeben: {{wiki:dokuwiki-128.png?200x50}}
|
||||
Größe für externe Bilder vorgeben: {{http://de3.php.net/images/php.gif?200x50}}
|
||||
|
||||
===== 3.3 Ausrichten von Bildern =====
|
||||
Mit Leerzeichen zur Rechten und/oder Linken innerhalb der Klammern kann ein Bild horizontal ausgerichtet werden (Links, Zentriert, Rechts).
|
||||
|
||||
{{ wiki:dokuwiki-128.png|Rechts}}
|
||||
|
||||
{{wiki:dokuwiki-128.png |Links}}
|
||||
|
||||
{{ wiki:dokuwiki-128.png |Zentriert}}
|
||||
|
||||
|
||||
{{wiki:dokuwiki-128.png }}
|
||||
{{ wiki:dokuwiki-128.png }}
|
||||
{{ wiki:dokuwiki-128.png}}
|
||||
|
||||
Bei Ausrichtung und der Verwendung eines Titels sollte man drauf achten, dass der Titel nach dem Leerzeichen kommt:
|
||||
|
||||
{{wiki:dokuwiki-128.png |Linksbündig}}
|
||||
{{ wiki:dokuwiki-128.png |Zentriert }}
|
||||
{{ wiki:dokuwiki-128.png|Rechtsbündig}}
|
||||
===== 3.4 Tooltips =====
|
||||
Auch Titel, in den meisten Browsern als Tooltip angezeigt, können angegeben werden.
|
||||
|
||||
{{ wiki:dokuwiki-128.png |Dies ist ein Titel}}
|
||||
|
||||
{{ wiki:dokuwiki-128.png |Dies ist ein Titel}}
|
||||
|
||||
===== 3.5 Dateidownload =====
|
||||
|
||||
Wenn eine Datei angegeben wird, die kein Bild (''gif, jpg, png'') ist, so wird sie als Link angezeigt und so zum Download angeboten.
|
||||
|
||||
{{ wiki:dokuwiki-128.txt |Beispiel}}
|
||||
<code>{{ wiki:dokuwiki-128.txt |Beispiel}}</code>
|
||||
|
||||
===== 3.6 Automatische Verlinkung =====
|
||||
|
||||
Bilder werden automatisch mit einer Verlinkung zur Ihren [[wpde>Metadaten]] erstellt - Bsp.: {{wiki:dokuwiki-128.png?15}}
|
||||
|
||||
Dieses Verhalten kann über die Option ?nolink((ggf. mit einem "&" mit anderen Optionen wie der Größenangabe kombinieren)) unterbunden werden((Standardmäßig lässt sich [[tips:image_nolink|dieses, oft unerwünschte, Verhalten]] momentan (13.03.2009) nicht für das komplette DokuWiki deaktivieren)):
|
||||
|
||||
{{wiki:dokuwiki-128.png?15&nolink}}
|
||||
{{wiki:dokuwiki-128.png?15&nolink}}
|
||||
|
||||
Außerdem kann mit ?direct das Bild, z.Bsp. als Vollansicht, direkt verlinkt werden:
|
||||
|
||||
{{wiki:dokuwiki-128.png?15&direct}}
|
||||
{{wiki:dokuwiki-128.png?15&direct}}
|
||||
|
||||
====== 4 Listen ======
|
||||
|
||||
DokuWiki kennt unsortierte und nummerierte Listen. Um einen Listeneintrag zu erzeugen, beginne eine Zeile mit zwei Leerzeichen. Diesen Leerzeichen folgt dann ein "*" für unsortierte oder ein "-" für nummerierte Listen.
|
||||
|
||||
* Dies ist ein Eintrag einer unsortierten Liste
|
||||
* Ein zweiter Eintrag
|
||||
* Unterschiedliche Ebenen einer Liste durch Hinzufügen von weiteren zwei Leerzeichen
|
||||
* Noch ein Eintrag
|
||||
|
||||
- Dies ist ein Eintrag einer nummerierte Liste
|
||||
- Ein zweiter Eintrag
|
||||
- Unterschiedliche Ebenen einer Liste durch Hinzufügen von weiteren zwei Leerzeichen
|
||||
- Noch ein Eintrag
|
||||
|
||||
<code>
|
||||
* Dies ist ein Eintrag einer unsortierten Liste
|
||||
* Ein zweiter Eintrag
|
||||
* Unterschiedliche Ebenen einer Liste durch Hinzufügen von weiteren zwei Leerzeichen
|
||||
* Noch ein Eintrag
|
||||
|
||||
- Dies ist ein Eintrag einer nummerierte Liste
|
||||
- Ein zweiter Eintrag
|
||||
- Unterschiedliche Ebenen einer Liste durch Hinzufügen von weiteren zwei Leerzeichen
|
||||
- Noch ein Eintrag
|
||||
</code>
|
||||
|
||||
====== 5 Tabellen ======
|
||||
|
||||
===== 5.1 Grundlegender Aufbau =====
|
||||
|
||||
Mit DokuWiki können Tabellen ganz einfach erstellt werden:
|
||||
|
||||
^ hervorgehoben ^ zum Beispiel für ^ eine Titelzeile ^
|
||||
| Zeile 1 Spalte 1 | Zeile 1 Spalte 2 | Zeile 1 Spalte 3 |
|
||||
| Zeile 2 Spalte 1 | doppelte Spaltenbreite (beachte den doppelten senkrechten Strich) ||
|
||||
| Zeile 3 Spalte 1 | Zeile 2 Spalte 2 | Zeile 2 Spalte 3 |
|
||||
| Zeile 4 Spalte 1 | | Zeile 4 Spalte 3 |
|
||||
|
||||
Felder einer Tabelle starten mit "|" für ein normales Feld oder mit einem "^" für hervorgehobenes Feld.
|
||||
|
||||
^ hervorgehoben ^ zum Beispiel für ^ eine Titelzeile ^
|
||||
| Zeile 1 Spalte 1 | Zeile 1 Spalte 2 | Zeile 1 Spalte 3 |
|
||||
| Zeile 2 Spalte 1 | doppelte Spaltenbreite (beachte den doppelten senkrechten Strich) ||
|
||||
| Zeile 3 Spalte 1 | Zeile 2 Spalte 2 | Zeile 2 Spalte 3 |
|
||||
|
||||
===== 5.2 Formatierung/Ausrichtung =====
|
||||
|
||||
=== Leerzellen ===
|
||||
|
||||
Zellen über mehrere Spalten werden erzeugt wenn man, wie oben gezeigt, am Ende einer solchen Spalte so viele "|" oder "^" ohne Leerzeichen dazwischen hintereinander setzt, wie Spalten überbrückt werden sollen.
|
||||
Kurz gesagt: Alle Zeilen einer Tabelle müssen die gleiche Anzahl an Feldtrennern "|" oder "^" haben.
|
||||
|
||||
Hervorgehobene Felder in Vertikaler Ausrichtung sind auch möglich.
|
||||
|
||||
| ^ hervorgehoben 1 ^ hervorgehoben 2 ^
|
||||
^ hervorgehoben 3 | Zeile 1 Spalte 2 | Zeile 1 Spalte 3 |
|
||||
^ hervorgehoben 4 | Zeile 2 Spalte 2 | |
|
||||
^ hervorgehoben 5 | Zeile 3 Spalte 2 | Zeile 3 Spalte 3 |
|
||||
|
||||
Wie wir sehen, entscheidet der Feldtrenner ("|" oder "^") vor einer Zelle über ihr Aussehen:
|
||||
|
||||
| ^ hervorgehoben 1 ^ hervorgehoben 2 ^
|
||||
^ hervorgehoben 3 | Zeile 1 Spalte 2 | Zeile 1 Spalte 3 |
|
||||
^ hervorgehoben 4 | Zeile 2 Spalte 2 | |
|
||||
^ hervorgehoben 5 | Zeile 3 Spalte 2 | Zeile 3 Spalte 3 |
|
||||
|
||||
=== Zellen verbinden ===
|
||||
|
||||
Felder über mehrere Zeilen (**vertikal verbundene Zellen**) lassen sich durch hinzufügen von '':::'' in der zu verbindenden Zelle zusammenfügen.\\
|
||||
:!: Zum Stand der //Release 2015-08-10a "Detritus"// können __Zellen der ersten Zeile nicht in vertikal verbundene Zellen einbezogen werden__.
|
||||
|
||||
|
||||
^ Titelzeile 1 ^ Titelzeile 2 ^ Titelzeile 3 ^
|
||||
| Zeile 1 Spalte 1 | Diese Zelle ist vertikal verbunden | Zeile 1 Spalte 3 |
|
||||
| Zeile 2 Spalte 1 | ::: | Zeile 2 Spalte 3 |
|
||||
| Zeile 3 Spalte 1 | ::: | Zeile 3 Spalte 3 |
|
||||
|
||||
Außer den drei Doppelpunkten darf die zu verbindende Zelle keine weiteren Inhalte haben.
|
||||
|
||||
^ Titelzeile 1 ^ Titelzeile 2 ^ Titelzeile 3 ^
|
||||
| Zeile 1 Spalte 1 | Diese Zelle ist vertikal verbunden | Zeile 1 Spalte 3 |
|
||||
| Zeile 2 Spalte 1 | ::: | Zeile 2 Spalte 3 |
|
||||
| Zeile 3 Spalte 1 | ::: | Zeile 3 Spalte 3 |
|
||||
|
||||
|
||||
Felder über mehrere Spalten (**horizontal verbundene Zellen**) lassen sich durch hinzufügen von ''^'' bzw. ''|'' in der zu verbindenden Zelle zusammenfügen.
|
||||
|
||||
^ Titelzeile 1 ^ Titelzeile 2 ^ Titelzeile 3 ^
|
||||
| Zeile 1 Spalte 1 | Diese Zelle ist horizontal verbunden ||
|
||||
| Zeile 2 Spalte 1 | Zeile 2 Spalte 2 | Zeile 2 Spalte 3 |
|
||||
| Zeile 3 Spalte 1 | Zeile 3 Spalte 2 | Zeile 3 Spalte 3 |
|
||||
|
||||
^ Titelzeile 1 ^ Titelzeile 2 ^ Titelzeile 3 ^
|
||||
| Zeile 1 Spalte 1 | Diese Zelle ist horizontal verbunden ||
|
||||
| Zeile 2 Spalte 1 | Zeile 2 Spalte 2 | Zeile 2 Spalte 3 |
|
||||
| Zeile 3 Spalte 1 | Zeile 3 Spalte 2 | Zeile 3 Spalte 3 |
|
||||
|
||||
=== Textausrichtung ===
|
||||
|
||||
Der Inhalt einer Zelle kann horizontal innerhalb der Zelle ausgerichtet werden:
|
||||
* Rechtsbündig - zwei Leerzeichen links vom Text
|
||||
* Linksbündig - Leerzeichen rechts vom Text
|
||||
* Zentriert - zwei Leerzeichen links und rechts vom Text
|
||||
|
||||
^ Tabelle mit Ausrichtung |||
|
||||
| Rechts | Mitte | Links |
|
||||
| Links | Rechts | Mitte |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
So sieht die Formatierung aus:
|
||||
|
||||
^ Tabelle mit Ausrichtung ^^^
|
||||
| Rechts| Mitte |Links |
|
||||
|Links | Rechts| Mitte |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
| Hinweis zu dem senkrechten Balken-Zeichen: dieses Zeichen ist auf einer PC-Tastatur erreichbar über die Taste "<" bei zusätzlich gedrückter "AltGr"-Taste. Ist dort auch aufgedruckt. Apple-Nutzer erreichen das Zeichen mit der Wahltaste ("Alt") und der "7". |
|
||||
|
||||
====== 6 sonstige Formatierungen ======
|
||||
|
||||
===== 6.1 horizontale Linie =====
|
||||
Mit vier aufeinander folgenden Minuszeichen (alleine in einer Zeile) kann eine horizontale Linie erzeugt werden:
|
||||
----
|
||||
<nowiki>----</nowiki>
|
||||
|
||||
|
||||
===== 6.2 Smileys =====
|
||||
|
||||
DokuWiki verwandelt oft genutzte [[wpde>Emoticon]]s zu kleinen Smiley-Grafiken.
|
||||
Weitere Smiley-Grafiken können im Ordner "smily" abgelegt und dann in der Datei ''conf/smileys.conf'' bzw. für benutzereigene Smileys unter ''conf/smileys.local.conf'' eingetragen werden.
|
||||
Hier ist nun eine Übersicht der standardmäßig in DokuWiki enthaltenen Smileys:
|
||||
|
||||
^ 8-) ^ 8-O ^ :-( ^ :-) ^ =) ^ :-/ ^ :-\ ^ :-? ^ :-D ^ :-P ^ :-O ^ :-X ^ :-| ^ ;-) ^ :?: ^ :!: ^ ''^_^'' ^ LOL ^ FIXME ^ DELETEME ^
|
||||
| %% 8-) %% | %% 8-O %% | %% :-( %% | %% :-) %% | %% =) %% | %% :-/ %% | %% :-\ %% | %% :-? %% | %% :-D %% | %% :-P %% | %% :-O %% | %% :-X %% | %% :-| %% | %% ;-) %% | %% :?: %% | %% :!: %% | %% ^_^ %% | %% LOL %% | %% FIXME %% | %% DELETEME %% |
|
||||
|
||||
===== 6.3 Typografie =====
|
||||
|
||||
[[DokuWiki]] kann einfache Textzeichen in ihre typografischen Entsprechungen umwandeln.
|
||||
Hier eine Liste aller Zeichen, die DokuWiki kennt:
|
||||
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
|
||||
<code>
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
</code>
|
||||
|
||||
Bitte beachtet: Diese Umwandlungen können in der Konfigurationsdatei abgestellt werden
|
||||
|
||||
===== 6.4 HTML und PHP einbinden =====
|
||||
|
||||
In einer Seite kann sowohl HTML als auch PHP direkt benutzt werden.
|
||||
|
||||
<html>
|
||||
This is some <font color="red" size="+1">HTML-Code</font>
|
||||
</html>
|
||||
|
||||
<code>
|
||||
<html>
|
||||
This is some <font color="red" size="+1">HTML-Code</font>
|
||||
</html>
|
||||
</code>
|
||||
|
||||
<code>
|
||||
<php>
|
||||
echo 'A logo generated by PHP:';
|
||||
echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
|
||||
</php>
|
||||
</code>
|
||||
|
||||
<code>
|
||||
<php>
|
||||
echo 'A logo generated by PHP:';
|
||||
echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
|
||||
</php>
|
||||
</code>
|
||||
|
||||
**Achtung**: Das Einbinden von HTML und PHP in einer Seite kann in der Konfigurationsdatei ausgeschaltet werden((Konfigurationsoptionen [[config:htmlok]] bzw. [[config:phpok]])). Ist diese Option aktiviert, wird der Quellcode dieser Abschnitte als Text angezeigt und nicht ausgeführt.
|
||||
|
||||
**Achtung**: Das Einbinden von HTML und PHP auf einer Seite im Internet ist gewöhnlich ein schweres Sicherheitsrisiko! Diese Funktion ist nur für das Intranet gedacht!
|
||||
|
||||
====== 7 Kontroll-Makros ======
|
||||
|
||||
Einige Syntax-Befehle beeinflussen wie Dokuwiki eine Seite beim Aufruf ausgibt. Die folgenden Kontroll-Makros sind verfügbar:
|
||||
|
||||
^ Makro ^ Beschreibung ^
|
||||
| %%~~NOTOC~~%% | Wenn dieses Makro in eine Seite eingebunden ist, wird das [[:toc|Table of Content]] nicht erstellt.|
|
||||
| %%~~NOCACHE~~%% | Alle Seiten werden aus Performancegründen zwischengespeichert. Unter bestimmten Umständen ist dieses Verhalten aber nicht gewollt. Beim Einfügen dieses Makros wird DokuWiki angewiesen, den Inhalt der Seite neu aufzubauen. |
|
||||
|
||||
----
|
||||
====== 8 Syntax-Plugins ======
|
||||
Die Syntax von DokuWiki kann durch [[doku>plugins|Plugins]] erweitert werden. Wie die einzelnen Plugins benutzt werden, steht auf den zugehörigen Beschreibungsseiten. Die folgenden Plugins sind auf dieser DokuWiki Installation verfügbar:
|
||||
|
||||
~~INFO:syntaxplugins~~
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
====== TECH SAVIOURS wiki ======
|
||||
|
||||
Das Wiki wird von [[https://www.dokuwiki.org/dokuwiki|DokuWiki]] in Kombination mit der [[https://www.dokuwiki.org/template:bootstrap3?s[]=bootstrap3|Bootstrap3]] Template betrieben.
|
||||
|
||||
===== Zur Wiki beitragen =====
|
||||
|
||||
Wie jedes Open-Source-Projekt lebt es von den Aktivitäten seiner Nutzer.
|
||||
|
||||
Die Dokumentation kann immer verbessert werden, oder du kannst mehr Tutorials erstellen. Aber es sollte einfach zu lesen und allgemein verständlich sein für Neueinsteiger, die mehr digitale Privatsphäre wollen, aber nicht wissen, wie man sie erreicht.
|
||||
|
||||
===== GitHub oder Registrierung =====
|
||||
|
||||
<alert type="danger">{{icon>exclamation}} GitHub funktioniert derzeit nicht.</alert>
|
||||
Die normale Prozedur fork/pull requests auf [[https://github.com/TECH-SAVIOURS-ORG/wiki/|GitHub]] oder schicke uns eine E-Mail an [[wiki@techsaviours.org?Subject=Registration%20Anfrage|wiki@techsaviours.org]], wenn du es vorziehst, dich auf der [[https://wiki.techsaviours.org|Wiki-Webseite]] direkt zu registrieren, da wir die Registrierung nicht aktiviert haben.
|
||||
|
||||
===== Syntax =====
|
||||
|
||||
Du kannst die [[de:wiki:syntax|DokuWiki's syntax]] verwenden. Wir haben versucht, [[https://www.markdownguide.org/cheat-sheet/|Markdown]] zu implementieren, aber leider funktioniert es nicht wirklich. Zu viele Fehlschläge mit Plugins oder Core.
|
||||
|
||||
|
||||
===== Struktur =====
|
||||
|
||||
Das Wiki ist hauptsächlich in 4 Teile gegliedert ([[https://www.dokuwiki.org/start?id=de:namespaces|Namespaces]]):
|
||||
|
||||
* Server
|
||||
* Operating Systems
|
||||
* Services
|
||||
* Phone
|
||||
* Operating Systems
|
||||
* Apps
|
||||
* Desktop
|
||||
* Operating Systems
|
||||
* Services
|
||||
* Extras
|
||||
|
||||
Es gibt auch ''faq'' und wahrscheinlich werden weitere folgen.
|
||||
|
||||
Wenn die Tutorials dieselben sind (z. B. Desktop und Server), erstelle die Seite und füge einen Link zu ihr hinzu
|
||||
|
||||
<code>
|
||||
{{page>de:server:services:name}}
|
||||
</code>
|
||||
<alert type="warning">{{icon>info}} Füge immer den Link vom Desktop zum Server hinzu. Das macht es einfacher, die Tutorials in Zukunft zu ändern.</alert>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:backup: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:desktop: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<markdown>
|
||||
# Header
|
||||
|
||||
simple paragraph: *emph* **strong** `mono`.
|
||||
|
||||
> quote
|
||||
|
||||
[link](https://www.dokuwiki.org)
|
||||
</markdown>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<markdown>
|
||||
# Header
|
||||
|
||||
simple paragraph: *emph* **strong** `mono`.
|
||||
|
||||
> quote
|
||||
|
||||
[link](https://www.dokuwiki.org)
|
||||
</markdown>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:desktop:environments: -sortAscending>
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
====== KDE ======
|
||||
|
||||
<code>
|
||||
pacman -S plasma xorg
|
||||
</code>
|
||||
|
||||
<code>
|
||||
systemctl enable --now sddm
|
||||
</code>
|
||||
|
||||
That's actually it.
|
||||
Check out all the [[https://archlinux.org/groups/x86_64/kde-applications/|KDE software]] and suggested packages below and install whatever you like.
|
||||
|
||||
|
||||
====== Suggested software ======
|
||||
|
||||
Just add the packages to the above ''pacman'' command.
|
||||
|
||||
===== System =====
|
||||
|
||||
<code>
|
||||
networkmanager-openvpn wireguard-tools keepassxc arch-audit konsole keditbookmarks gparted htop dolphin spectacle wget lm_sensors ark kleopatra kate kompare rsync
|
||||
</code>
|
||||
|
||||
===== Audio =====
|
||||
|
||||
<code>
|
||||
pulseaudio pulseaudio-alsa
|
||||
</code>
|
||||
|
||||
===== Multimedia/Graphics =====
|
||||
|
||||
<code>
|
||||
vlc openshot gimp inkscape
|
||||
</code>
|
||||
|
||||
===== Office =====
|
||||
|
||||
<code>
|
||||
thunderbird thunderbird-i18n-en-us wqy-zenhei ttf-liberation libreoffice-fresh cups cups-pdf xsane system-config-printer kdeconnect firefox okular gwenview
|
||||
</code>
|
||||
|
||||
If you install ''cups'' you also need to enable the service:
|
||||
<code>
|
||||
systemctl enable --now cups.service
|
||||
</code>
|
||||
|
||||
===== Others =====
|
||||
|
||||
<code>
|
||||
bash-completion cronie
|
||||
</code>
|
||||
|
||||
Add for ''bash-complition'' the following to your ''.bashrc'':
|
||||
<code>
|
||||
echo "if [ -f /etc/bash_completion ]; then
|
||||
. /etc/bash_completion
|
||||
fi" >> ~/.bashrc
|
||||
</code>
|
||||
|
||||
Enable service for ''cronie'':
|
||||
<code>
|
||||
systemctl enable --now cronie.service
|
||||
</code>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:desktop:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
{{page>en:server:operating_systems:arch_linux}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:desktop:services: -sortAscending>
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
====== DNSCrypt ======
|
||||
|
||||
===== Install on your device =====
|
||||
|
||||
Follow the [[https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Installation#os-specific-instructions|link]] and select your operating system.
|
||||
|
||||
|
||||
===== Config file =====
|
||||
|
||||
Change your ''dnscrypt-proxy.toml'' config file.
|
||||
|
||||
==== server_names ====
|
||||
|
||||
<code>
|
||||
server_names = ['techsaviours.org']
|
||||
</code>
|
||||
|
||||
|
||||
==== Sources ====
|
||||
|
||||
Disable all
|
||||
|
||||
<code>
|
||||
[sources]
|
||||
</code>
|
||||
|
||||
|
||||
==== Anonymized DNS ====
|
||||
|
||||
Go to the bottom ''routes = ['' and add:
|
||||
|
||||
<code>
|
||||
routes = [
|
||||
{ server_name='2.dnscrypt-cert.techsaviours.org', via=['sdns://gRI0NS4xMzIuMjQ1Ljk1OjQ0MzQ'] }
|
||||
]
|
||||
</code>
|
||||
|
||||
|
||||
==== Static ====
|
||||
|
||||
Scroll down to the bottom and add the TECH **SAVIOURS** server in ''static'' and ''stamp'':
|
||||
|
||||
<code>
|
||||
[static.'techsaviours.org']
|
||||
stamp = 'sdns://AQcAAAAAAAAAEjQ1LjEzMi4yNDUuOTU6NDQzNCAaKOG7s_XPRo0TVYMDCtgWPemMyDThFEe1os3q_As_UCAyLmRuc2NyeXB0LWNlcnQudGVjaHNhdmlvdXJzLm9yZw'
|
||||
</code>
|
||||
|
||||
Restart the service or reconnect your client.
|
||||
|
|
@ -0,0 +1 @@
|
|||
{{page>en:server:services:searx}}
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist %%CURRENT_NAMESPACE%% -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:extras: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
* [[en:wiki|WIKI]]
|
||||
* [[https://techsaviours.org|HOME]]
|
||||
* [[https://techsaviours.org/news|NEWS]]
|
||||
* [[https://techsaviours.org/#services|WHY?]]
|
||||
* [[https://techsaviours.org/#tutorials|TUTORIALS]]
|
||||
* [[https://techsaviours.org/#freeservices|SERVICES]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:phone: -noAddPageButton -sortAscending -sortDescending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:phone:apps: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
soon
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:phone:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
soon
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist %%CURRENT_NAMESPACE%% -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:server: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<markdown>
|
||||
# Header
|
||||
|
||||
simple paragraph: *emph* **strong** `mono`.
|
||||
|
||||
> quote
|
||||
|
||||
[link](https://www.dokuwiki.org)
|
||||
</markdown>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<markdown>
|
||||
# Header
|
||||
|
||||
simple paragraph: *emph* **strong** `mono`.
|
||||
|
||||
> quote
|
||||
|
||||
[link](https://www.dokuwiki.org)
|
||||
</markdown>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:server:operating_systems: -sortAscending>
|
||||
|
|
@ -0,0 +1,356 @@
|
|||
====== Arch Linux ======
|
||||
|
||||
The guide is for both - server and desktop.
|
||||
|
||||
It includes:
|
||||
|
||||
**Server & Desktop**
|
||||
|
||||
* UEFI
|
||||
* systemd-boot
|
||||
* LVM on LUKS
|
||||
* NetworkManager
|
||||
* zram
|
||||
* doas
|
||||
* nftables
|
||||
|
||||
**Desktop**
|
||||
|
||||
* Xorg
|
||||
* KDE / Plasma
|
||||
* SDDM
|
||||
|
||||
===== Download the ISO =====
|
||||
|
||||
[[https://www.archlinux.org/download/]]
|
||||
|
||||
===== Inital setup =====
|
||||
|
||||
If using a US keyboard:
|
||||
|
||||
<code>
|
||||
ls /usr/share/kbd/keymaps/**/*.map.gz
|
||||
loadkeys us
|
||||
</code>
|
||||
|
||||
Check if system is under UEFI:
|
||||
|
||||
<code>
|
||||
ls /sys/firmware/efi/efivars
|
||||
</code>
|
||||
|
||||
Connect to wifi if needed
|
||||
|
||||
<code>
|
||||
iwctl
|
||||
device list
|
||||
station DEVICE_NAME scan
|
||||
station DEVICE_NAME get-networks
|
||||
station DEVICE_NAME connect SSID
|
||||
</code>
|
||||
|
||||
Enable NTP and set timezone
|
||||
|
||||
<code>
|
||||
timedatectl set-ntp true
|
||||
timedatectl set-timezone Pacific/Auckland
|
||||
</code>
|
||||
|
||||
Test Connection
|
||||
|
||||
<code>
|
||||
ping techsaviours.org -c 1
|
||||
</code>
|
||||
|
||||
===== Format disk/s and create partitions =====
|
||||
|
||||
Format your disks and create GPT table.
|
||||
|
||||
<code>
|
||||
cfdisk /dev/sd*
|
||||
</code>
|
||||
|
||||
Typical partitions look like this:
|
||||
^ Partitions ^ Space | Type |
|
||||
| /dev/sda1 (boot) | 512M | EFI System |
|
||||
| /dev/sda2 (root) | xG | Linux Filesystem (ext4,...) |
|
||||
| /dev/sdb1 (home) (optional) | xG | Linux Filesystem (ext4,...) |
|
||||
|
||||
<alert type="info" icon="fa fa-info-circle">As an option, the home partition - ''/dev/sdb1'', if you want to use another hard drive</alert>
|
||||
|
||||
===== LVM on LUKS =====
|
||||
|
||||
==== Create LUKS ====
|
||||
|
||||
**root**
|
||||
<code>
|
||||
cryptsetup luksFormat --type luks2 --cipher aes-xts-plain64 --key-size 512 /dev/sda2
|
||||
cryptsetup open /dev/sda2 root
|
||||
</code>
|
||||
|
||||
**home**
|
||||
(Optional) Second disk (/dev/sdb1)
|
||||
|
||||
<code>
|
||||
cryptsetup luksFormat --type luks2 --cipher aes-xts-plain64 --key-size 512 /dev/sdb1
|
||||
cryptsetup open /dev/sdb1 home
|
||||
</code>
|
||||
|
||||
==== Create LVM ====
|
||||
|
||||
=== Preparing the physical volumes, volume groups and logical volumes ===
|
||||
|
||||
**root**
|
||||
<code>
|
||||
pvcreate /dev/mapper/root
|
||||
vgcreate vg0 /dev/mapper/root
|
||||
lvcreate -l 100%FREE vg0 -n root
|
||||
</code>
|
||||
|
||||
**home** (optional)
|
||||
|
||||
<code>
|
||||
pvcreate /dev/mapper/home
|
||||
vgcreate vg1 /dev/mapper/home
|
||||
lvcreate -l 100%FREE vg1 -n home
|
||||
</code>
|
||||
|
||||
=== Format filesystems and mount ===
|
||||
|
||||
**root**
|
||||
<code>
|
||||
mkfs.ext4 /dev/vg0/root
|
||||
mount /dev/vg0/root /mnt
|
||||
</code>
|
||||
|
||||
**boot**
|
||||
<code>
|
||||
mkfs.fat -F32 /dev/sda1
|
||||
mkdir /mnt/boot
|
||||
mount /dev/sda1 /mnt/boot
|
||||
</code>
|
||||
|
||||
**home** (optional)
|
||||
|
||||
<code>
|
||||
mkfs.ext4 /dev/vg1/home
|
||||
mkdir /mnt/home
|
||||
mount /dev/vg1/home /mnt/home
|
||||
</code>
|
||||
|
||||
===== Install the base packages =====
|
||||
|
||||
<code>
|
||||
pacstrap /mnt base base-devel linux-hardened linux-hardened-docs linux-hardened-headers linux-firmware nano networkmanager lvm2 opendoas openssh iptables-nft
|
||||
</code>
|
||||
|
||||
===== Configure the system =====
|
||||
|
||||
<code>
|
||||
genfstab -U /mnt > /mnt/etc/fstab
|
||||
arch-chroot /mnt
|
||||
</code>
|
||||
|
||||
==== Timezone ====
|
||||
|
||||
<code>
|
||||
ln -sf /usr/share/zoneinfo/Pacific/Auckland /etc/localtime
|
||||
hwclock --systohc
|
||||
</code>
|
||||
|
||||
Uncomment your location. For example: //en_US.UTF-8 UTF-8//
|
||||
|
||||
<code>
|
||||
nano /etc/locale.gen
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "LANG=en_US.UTF-8
|
||||
LC_ADDRESS=en_US.UTF-8
|
||||
LC_IDENTIFICATION=en_US.UTF-8
|
||||
LC_MEASUREMENT=en_US.UTF-8
|
||||
LC_MONETARY=en_US.UTF-8
|
||||
LC_NAME=en_US.UTF-8
|
||||
LC_NUMERIC=en_US.UTF-8
|
||||
LC_PAPER=en_US.UTF-8
|
||||
LC_TELEPHONE=en_US.UTF-8
|
||||
LC_TIME=en_US.UTF-8
|
||||
LC_ALL=en_US.UTF-8" >> /etc/locale.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
locale-gen
|
||||
</code>
|
||||
|
||||
==== Keyboard layout ====
|
||||
|
||||
<code>
|
||||
ls /usr/share/kbd/keymaps/**/*.map.gz
|
||||
nano /etc/vconsole.conf
|
||||
</code>
|
||||
<code>
|
||||
KEYMAP=YOUR_KEYBOARD
|
||||
</code>
|
||||
|
||||
==== Hostname ====
|
||||
|
||||
<code>
|
||||
echo "arch" > /etc/hostname
|
||||
</code>
|
||||
|
||||
|
||||
==== Host file ====
|
||||
|
||||
<code>
|
||||
echo "127.0.0.1 localhost
|
||||
::1 localhost
|
||||
127.0.1.1 arch.localdomain arch" >> /etc/hosts
|
||||
</code>
|
||||
|
||||
==== root password ====
|
||||
<code>
|
||||
passwd
|
||||
</code>
|
||||
|
||||
==== Create an initial ramdisk ====
|
||||
|
||||
<code>
|
||||
nano /etc/mkinitcpio.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
HOOKS=(base udev autodetect keyboard keymap modconf block encrypt lvm2 filesystems fsck)
|
||||
</code>
|
||||
|
||||
<code>
|
||||
mkinitcpio -P
|
||||
</code>
|
||||
|
||||
==== Bootloader ====
|
||||
|
||||
<code>
|
||||
bootctl install
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "title Arch Linux
|
||||
linux /vmlinuz-linux-hardened
|
||||
initrd /initramfs-linux-hardened.img
|
||||
options cryptdevice=UUID=$(blkid -s UUID -o value /dev/sda2):root root=/dev/vg0/root rw" >> /boot/loader/entries/arch.conf
|
||||
</code>
|
||||
|
||||
<code>
|
||||
echo "title Arch Linux (fallback initramfs)
|
||||
linux /vmlinuz-linux-hardened
|
||||
initrd /initramfs-linux-hardened-fallback.img
|
||||
options cryptdevice=UUID=$(blkid -s UUID -o value /dev/sda2)=root root=/dev/vg0/root rw" >> /boot/loader/entries/arch-fallback.conf
|
||||
</code>
|
||||
|
||||
==== Microcode ====
|
||||
|
||||
Depends on your CPU - __//AMD//__ or __//Intel//__ - choose one of the following commands:
|
||||
|
||||
<code>
|
||||
pacman -S intel-ucode
|
||||
</code>
|
||||
<code>
|
||||
pacman -S amd-ucode
|
||||
</code>
|
||||
|
||||
and add ''initrd /**intel**-ucode.img'' or ''initrd /**amd**-ucode.img'' above ''initrd /initramfs-linux-hardened.img'', ''initrd /initramfs-linux-hardened-**fallback**.img'' in ''/boot/loader/entries/arch.conf'' and ''/boot/loader/entries/arch-**fallback**.conf''
|
||||
|
||||
==== doas ====
|
||||
|
||||
Allow members of group ''wheel'' to run commands:
|
||||
|
||||
<code>
|
||||
echo "permit persist :wheel" >> /etc/doas.conf
|
||||
chown -c root:root /etc/doas.conf
|
||||
chmod -c 0400 /etc/doas.conf
|
||||
</code>
|
||||
|
||||
<alert type="danger" icon="fa fa-warning">The ''persist'' feature is disabled by default [....] This feature is new and potentially dangerous, in the original doas, a kernel API is used to set and clear timeouts. This API is openbsd specific and no similar API is available on other operating systems.
|
||||
</alert>
|
||||
|
||||
=== Sudo user? ===
|
||||
|
||||
<code>
|
||||
pacman -Rsn opendoas
|
||||
pacman -S sudo
|
||||
</code>
|
||||
|
||||
or
|
||||
|
||||
<code>
|
||||
echo "alias sudo='doas'
|
||||
alias sudoedit='doas rnano'" >> ~/.bashrc
|
||||
</code>
|
||||
|
||||
==== Add user ====
|
||||
|
||||
Change ''USER'' to your name.
|
||||
|
||||
<code>
|
||||
useradd -m -G wheel -s /bin/bash USER
|
||||
passwd USER
|
||||
</code>
|
||||
|
||||
==== zram ====
|
||||
|
||||
|
||||
=== Module ===
|
||||
|
||||
<code>
|
||||
echo "zram" >> /etc/modules-load.d/zram.conf
|
||||
</code>
|
||||
|
||||
=== Modprobe ===
|
||||
|
||||
<code>
|
||||
echo "options zram num_devices=1" >> /etc/modprobe.d/zram.conf
|
||||
</code>
|
||||
|
||||
=== Udev ===
|
||||
|
||||
<code>
|
||||
echo 'KERNEL=="zram0", ATTR{disksize}="4GB" RUN="/usr/bin/mkswap /dev/zram0", TAG+="systemd"' >> /etc/udev/rules.d/99-zram.rules
|
||||
</code>
|
||||
|
||||
=== Fstab ===
|
||||
|
||||
<code>
|
||||
echo "# swap
|
||||
/dev/zram0 none swap defaults 0 0
|
||||
" >> /etc/fstab
|
||||
</code>
|
||||
|
||||
==== Enable services ====
|
||||
|
||||
<code>
|
||||
systemctl enable --now NetworkManager.service
|
||||
systemctl enable --now sshd.service
|
||||
</code>
|
||||
|
||||
==== (Optional) Add key for home partition ====
|
||||
|
||||
If you have decided to use an additional partition or drive, you can also use a key instead of entering the passphrase over and over again. This way it only stays for root to enter the passphrase.
|
||||
|
||||
<code>
|
||||
mkdir /etc/luks-keys/
|
||||
dd bs=512 count=4 if=/dev/urandom of=/etc/luks-keys/home.bin
|
||||
chmod -cR 0400 /etc/luks-keys/
|
||||
cryptsetup luksAddKey /dev/sdb1 /etc/luks-keys/home.bin
|
||||
echo "home /dev/sdb1 /etc/luks-keys/home.bin" >> /etc/crypttab
|
||||
</code>
|
||||
|
||||
==== Reboot ====
|
||||
|
||||
<code>
|
||||
exit
|
||||
</code>
|
||||
<code>
|
||||
umount -R /mnt
|
||||
reboot
|
||||
</code>
|
||||
|
||||
<alert type="info">Congratulation 🍻 The server part is done! Continue with [[en:desktop:environments:kde|KDE]] if you want to install a desktop environment.</alert>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:server:services: -sortAscending>
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
====== Searx ======
|
||||
|
||||
Only available for Linux systems!
|
||||
|
||||
===== Packages =====
|
||||
|
||||
==== Ubuntu / Debian ====
|
||||
|
||||
<code>
|
||||
sudo -H apt-get install -y \
|
||||
virtualenv python3-dev python3-babel python3-venv \
|
||||
uwsgi uwsgi-plugin-python3 \
|
||||
git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev \
|
||||
shellcheck
|
||||
</code>
|
||||
|
||||
==== Arch Linux ====
|
||||
|
||||
<code>
|
||||
sudo -H pacman -S --noconfirm \
|
||||
python-virtualenv python python-pip python-lxml python-babel \
|
||||
uwsgi uwsgi-plugin-python \
|
||||
git base-devel libxml2 \
|
||||
shellcheck
|
||||
</code>
|
||||
|
||||
==== Fedora / RHEL ====
|
||||
|
||||
<code>
|
||||
sudo -H dnf install -y \
|
||||
virtualenv python python-pip python-lxml python-babel \
|
||||
uwsgi uwsgi-plugin-python3 \
|
||||
git @development-tools libxml2 \
|
||||
ShellCheck
|
||||
</code>
|
||||
|
||||
===== Create User =====
|
||||
|
||||
<code>
|
||||
sudo -H useradd --shell /bin/bash --system \
|
||||
--home-dir /usr/local/searx \
|
||||
--comment Privacy-respecting metasearch engine searx
|
||||
|
||||
sudo -H mkdir /usr/local/searx
|
||||
sudo -H chown -R searx:searx /usr/local/searx
|
||||
</code>
|
||||
|
||||
===== Searx Dependencies (searx user/terminal) =====
|
||||
|
||||
<code>
|
||||
sudo -H -u searx -i
|
||||
git clone https://github.com/asciimoo/searx.git /usr/local/searx/searx-srcx
|
||||
</code>
|
||||
|
||||
===== Create Virtual Environment (searx user/terminal) =====
|
||||
|
||||
<code>
|
||||
python3 -m venv /usr/local/searx/searx-pyenv
|
||||
echo . /usr/local/searx/searx-pyenv/bin/activate >> /usr/local/searx/.profile
|
||||
</code>
|
||||
|
||||
===== Start another Terminal (update) =====
|
||||
|
||||
<code>
|
||||
pip install -U pip
|
||||
pip install -U setuptools
|
||||
pip install -U wheel
|
||||
</code>
|
||||
|
||||
===== Install Searx into Virtual Environment (back to searx user/terminal) =====
|
||||
|
||||
<code>
|
||||
cd /usr/local/searx/searx-src
|
||||
pip install -e .
|
||||
</code>
|
||||
|
||||
===== Configuration =====
|
||||
|
||||
<code>
|
||||
sudo -H cp /usr/local/searx/searx-src/searx/settings.yml /etc/searx/settings.yml
|
||||
sudo -H sed -i -e s/ultrasecretkey/\9873266d1c899b68f21ca049ae5e5d93/g /etc/searx/settings.yml
|
||||
sudo -H sed -i -e s/{instance_name}/searx@\ryzen/g /etc/searx/settings.yml
|
||||
</code>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist %%CURRENT_NAMESPACE%% -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
~~NOCACHE~~
|
||||
|
||||
=== Tutorials ===
|
||||
* [[:en:server|Server]]
|
||||
* [[:en:server:operating_systems|Operating Systems]]
|
||||
* [[:en:server:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:en:server:services|Services]]
|
||||
* [[:en:server:services:searx|Searx]]
|
||||
* [[:en:phone|Phone]]
|
||||
* [[:en:phone:operating_systems|Operating Systems]]
|
||||
* [[:en:phone:operating_systems:android|Android]]
|
||||
* [[:en:phone:apps|Apps]]
|
||||
* [[:en:phone:apps:magisk|Magisk]]
|
||||
* [[:en:desktop|Desktop]]
|
||||
* [[:en:desktop:operating_systems|Operating Systems]]
|
||||
* [[:en:desktop:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:en:desktop:environments|Environments]]
|
||||
* [[:en:desktop:environments:kde|KDE]]
|
||||
* [[:en:desktop:services|Services]]
|
||||
* [[:en:desktop:services:dnscrypt|DNSCrypt]]
|
||||
* [[:en:desktop:services:searx|Searx]]
|
||||
* [[:en:backup|Backup]]
|
||||
* [[:en:backup:server|Server]]
|
||||
* [[:en:backup:phone|Phone]]
|
||||
* [[:en:backup:desktop|Desktop]]
|
||||
* [[:en:extras|Extras]]
|
||||
* [[:en:vulnerability_scans|Vulnerability Scans]]
|
||||
* [[:en:vulnerability_scans:log4shell|Log4shell]]
|
||||
* [[:en:faq|FAQ]]
|
||||
|
||||
=== Contributing ===
|
||||
* [[:en:wiki:wikirules|Contributing to wiki]]
|
||||
|
||||
=== Miscellaneous ===
|
||||
* [[:en:wiki:dokuwiki|About DokuWiki]]
|
||||
* [[:en:wiki:syntax|DokuWiki syntax]]
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:vulnerability-scans: -noAddPageButton -sortAscending>
|
||||
|
|
@ -0,0 +1 @@
|
|||
<catlist en:vulnerability_scans: -sortAscending>
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
====== Log4shell ======
|
||||
|
||||
On December the 9th, 2021, Apache published a severe vulnerability called [[https://nvd.nist.gov/vuln/detail/CVE-2021-44228|Log4shell]] (and other Log4j-related vulnerabilities).
|
||||
|
||||
===== Download =====
|
||||
|
||||
How to scan your services quickly, basically with log4j-scan from fullhunt, but using cisagov:
|
||||
<code>
|
||||
git clone https://github.com/cisagov/log4j-scanner.git
|
||||
cd log4-scanner/
|
||||
</code>
|
||||
|
||||
==== Requirements ====
|
||||
|
||||
* python
|
||||
* python-requests
|
||||
* python-termcolor
|
||||
* python-pycryptodome
|
||||
|
||||
|
||||
===== Create a url list =====
|
||||
|
||||
The easiest way is to create a list of all URLs you want to check:
|
||||
<code>
|
||||
nano urls.txt
|
||||
</code>
|
||||
<code>
|
||||
https://techsaviours.org
|
||||
https://meet.techsaviours.org
|
||||
https://searx.techsaviours.org
|
||||
</code>
|
||||
|
||||
===== Check your urls =====
|
||||
|
||||
<code>
|
||||
python log4j-scan.py -l urls.txt --waf-bypass --run-all-tests
|
||||
</code>
|
||||
|
||||
or just a url
|
||||
|
||||
<code>
|
||||
python log4j-scan.py -u https://techsaviours.org --waf-bypass --run-all-tests
|
||||
</code>
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<alert type="success" icon="fa fa-info-circle">**Arch Linux** & **KDE** __tutorial__ is done 🍻 [[en/server/operating_systems/arch_linux|Have a look]]!</alert>
|
||||
|
||||
====== Welcome to TECH SAVIOURS Wiki ======
|
||||
We would like to give you the opportunity here to achieve your digital privacy goals as a DIY solution. We cover the most important devices we use every day.
|
||||
|
||||
So feel free to follow the tutorials and get your digital privacy under control and share only what you really want to share.
|
||||
|
||||
====== Contributing ======
|
||||
If you are interested in adding more devices or making some improvements, see our [[en:wiki:wikirules|wiki rules]].
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
====== DokuWiki ======
|
||||
|
||||
[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a simple to use and highly versatile Open Source [[wp>wiki]] software that doesn't require a database. It is loved by users for its clean and readable [[wiki:syntax]]. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in [[doku>acl|access controls]] and [[doku>auth|authentication connectors]] make DokuWiki especially useful in the enterprise context and the large number of [[doku>plugins]] contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.
|
||||
|
||||
Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
|
||||
|
||||
===== Download =====
|
||||
|
||||
DokuWiki is available at https://download.dokuwiki.org/
|
||||
|
||||
|
||||
===== Read More =====
|
||||
|
||||
All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]].
|
||||
|
||||
**About DokuWiki**
|
||||
|
||||
* [[doku>features|A feature list]] :!:
|
||||
* [[doku>users|Happy Users]]
|
||||
* [[doku>press|Who wrote about it]]
|
||||
* [[doku>blogroll|What Bloggers think]]
|
||||
* [[https://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]]
|
||||
|
||||
**Installing DokuWiki**
|
||||
|
||||
* [[doku>requirements|System Requirements]]
|
||||
* [[https://download.dokuwiki.org/|Download DokuWiki]] :!:
|
||||
* [[doku>changes|Change Log]]
|
||||
* [[doku>Install|How to install or upgrade]] :!:
|
||||
* [[doku>config|Configuration]]
|
||||
|
||||
**Using DokuWiki**
|
||||
|
||||
* [[doku>syntax|Wiki Syntax]]
|
||||
* [[doku>manual|The manual]] :!:
|
||||
* [[doku>FAQ|Frequently Asked Questions (FAQ)]]
|
||||
* [[doku>glossary|Glossary]]
|
||||
|
||||
**Customizing DokuWiki**
|
||||
|
||||
* [[doku>tips|Tips and Tricks]]
|
||||
* [[doku>Template|How to create and use templates]]
|
||||
* [[doku>plugins|Installing plugins]]
|
||||
* [[doku>development|Development Resources]]
|
||||
|
||||
**DokuWiki Feedback and Community**
|
||||
|
||||
* [[doku>newsletter|Subscribe to the newsletter]] :!:
|
||||
* [[doku>mailinglist|Join the mailing list]]
|
||||
* [[https://forum.dokuwiki.org|Check out the user forum]]
|
||||
* [[doku>irc|Talk to other users in the IRC channel]]
|
||||
* [[https://github.com/splitbrain/dokuwiki/issues|Submit bugs and feature wishes]]
|
||||
* [[doku>thanks|Some humble thanks]]
|
||||
|
||||
|
||||
===== Copyright =====
|
||||
|
||||
2004-2020 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[https://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
|
||||
|
||||
The DokuWiki engine is licensed under [[https://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-).
|
||||
|
||||
Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]].
|
||||
|
|
@ -0,0 +1,525 @@
|
|||
====== Formatting Syntax ======
|
||||
|
||||
[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing "Edit this page". If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too.
|
||||
|
||||
===== Basic Text Formatting =====
|
||||
|
||||
DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these.
|
||||
|
||||
DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts.
|
||||
Of course you can **__//''combine''//__** all these.
|
||||
|
||||
You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
|
||||
|
||||
You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
|
||||
|
||||
You can mark something as <del>deleted</del> as well.
|
||||
|
||||
You can mark something as <del>deleted</del> as well.
|
||||
|
||||
**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line.
|
||||
|
||||
This is some text with some linebreaks\\ Note that the
|
||||
two backslashes are only recognized at the end of a line\\
|
||||
or followed by\\ a whitespace \\this happens without it.
|
||||
|
||||
This is some text with some linebreaks\\ Note that the
|
||||
two backslashes are only recognized at the end of a line\\
|
||||
or followed by\\ a whitespace \\this happens without it.
|
||||
|
||||
You should use forced newlines only if really needed.
|
||||
|
||||
===== Links =====
|
||||
|
||||
DokuWiki supports multiple ways of creating links.
|
||||
|
||||
==== External ====
|
||||
|
||||
External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: <andi@splitbrain.org> are recognized, too.
|
||||
|
||||
DokuWiki supports multiple ways of creating links. External links are recognized
|
||||
automagically: http://www.google.com or simply www.google.com - You can set
|
||||
link text as well: [[http://www.google.com|This Link points to google]]. Email
|
||||
addresses like this one: <andi@splitbrain.org> are recognized, too.
|
||||
|
||||
==== Internal ====
|
||||
|
||||
Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]].
|
||||
|
||||
Internal links are created by using square brackets. You can either just give
|
||||
a [[pagename]] or use an additional [[pagename|link text]].
|
||||
|
||||
[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed.
|
||||
|
||||
You can use [[some:namespaces]] by using a colon in the pagename.
|
||||
|
||||
You can use [[some:namespaces]] by using a colon in the pagename.
|
||||
|
||||
For details about namespaces see [[doku>namespaces]].
|
||||
|
||||
Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]].
|
||||
|
||||
This links to [[syntax#internal|this Section]].
|
||||
|
||||
Notes:
|
||||
|
||||
* Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones.
|
||||
* DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled.
|
||||
* When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much.
|
||||
|
||||
==== Interwiki ====
|
||||
|
||||
DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
|
||||
|
||||
DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis.
|
||||
For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
|
||||
|
||||
==== Windows Shares ====
|
||||
|
||||
Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]].
|
||||
|
||||
Windows Shares like [[\\server\share|this]] are recognized, too.
|
||||
|
||||
Notes:
|
||||
|
||||
* For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
|
||||
* For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code - conf/lang/en/lang.php>
|
||||
<?php
|
||||
/**
|
||||
* Customization of the english language file
|
||||
* Copy only the strings that needs to be modified
|
||||
*/
|
||||
$lang['js']['nosmblinks'] = '';
|
||||
</code>
|
||||
|
||||
==== Image Links ====
|
||||
|
||||
You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this:
|
||||
|
||||
[[http://php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
[[http://php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
Please note: The image formatting is the only formatting syntax accepted in link names.
|
||||
|
||||
The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links).
|
||||
|
||||
===== Footnotes =====
|
||||
|
||||
You can add footnotes ((This is a footnote)) by using double parentheses.
|
||||
|
||||
You can add footnotes ((This is a footnote)) by using double parentheses.
|
||||
|
||||
===== Sectioning =====
|
||||
|
||||
You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''<nowiki>~~NOTOC~~</nowiki>'' in the document.
|
||||
|
||||
==== Headline Level 3 ====
|
||||
=== Headline Level 4 ===
|
||||
== Headline Level 5 ==
|
||||
|
||||
==== Headline Level 3 ====
|
||||
=== Headline Level 4 ===
|
||||
== Headline Level 5 ==
|
||||
|
||||
By using four or more dashes, you can make a horizontal line:
|
||||
|
||||
----
|
||||
|
||||
===== Media Files =====
|
||||
|
||||
You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them.
|
||||
|
||||
Real size: {{wiki:dokuwiki-128.png}}
|
||||
|
||||
Resize to given width: {{wiki:dokuwiki-128.png?50}}
|
||||
|
||||
Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
|
||||
|
||||
Resized external image: {{https://secure.php.net/images/php.gif?200x50}}
|
||||
|
||||
Real size: {{wiki:dokuwiki-128.png}}
|
||||
Resize to given width: {{wiki:dokuwiki-128.png?50}}
|
||||
Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
|
||||
Resized external image: {{https://secure.php.net/images/php.gif?200x50}}
|
||||
|
||||
|
||||
By using left or right whitespaces you can choose the alignment.
|
||||
|
||||
{{ wiki:dokuwiki-128.png}}
|
||||
|
||||
{{wiki:dokuwiki-128.png }}
|
||||
|
||||
{{ wiki:dokuwiki-128.png }}
|
||||
|
||||
{{ wiki:dokuwiki-128.png}}
|
||||
{{wiki:dokuwiki-128.png }}
|
||||
{{ wiki:dokuwiki-128.png }}
|
||||
|
||||
Of course, you can add a title (displayed as a tooltip by most browsers), too.
|
||||
|
||||
{{ wiki:dokuwiki-128.png |This is the caption}}
|
||||
|
||||
{{ wiki:dokuwiki-128.png |This is the caption}}
|
||||
|
||||
For linking an image to another page see [[#Image Links]] above.
|
||||
|
||||
==== Supported Media Formats ====
|
||||
|
||||
DokuWiki can embed the following media formats directly.
|
||||
|
||||
| Image | ''gif'', ''jpg'', ''png'' |
|
||||
| Video | ''webm'', ''ogv'', ''mp4'' |
|
||||
| Audio | ''ogg'', ''mp3'', ''wav'' |
|
||||
| Flash | ''swf'' |
|
||||
|
||||
If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
|
||||
|
||||
By adding ''?linkonly'' you provide a link to the media without displaying it inline
|
||||
|
||||
{{wiki:dokuwiki-128.png?linkonly}}
|
||||
|
||||
{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image.
|
||||
|
||||
==== Fallback Formats ====
|
||||
|
||||
Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
|
||||
|
||||
For example consider this embedded mp4 video:
|
||||
|
||||
{{video.mp4|A funny video}}
|
||||
|
||||
When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser.
|
||||
|
||||
Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work.
|
||||
|
||||
===== Lists =====
|
||||
|
||||
Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones.
|
||||
|
||||
* This is a list
|
||||
* The second item
|
||||
* You may have different levels
|
||||
* Another item
|
||||
|
||||
- The same list but ordered
|
||||
- Another item
|
||||
- Just use indention for deeper levels
|
||||
- That's it
|
||||
|
||||
<code>
|
||||
* This is a list
|
||||
* The second item
|
||||
* You may have different levels
|
||||
* Another item
|
||||
|
||||
- The same list but ordered
|
||||
- Another item
|
||||
- Just use indention for deeper levels
|
||||
- That's it
|
||||
</code>
|
||||
|
||||
Also take a look at the [[doku>faq:lists|FAQ on list items]].
|
||||
|
||||
===== Text Conversions =====
|
||||
|
||||
DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML.
|
||||
|
||||
The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well.
|
||||
|
||||
==== Text to Image Conversions ====
|
||||
|
||||
DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki:
|
||||
|
||||
* 8-) %% 8-) %%
|
||||
* 8-O %% 8-O %%
|
||||
* :-( %% :-( %%
|
||||
* :-) %% :-) %%
|
||||
* =) %% =) %%
|
||||
* :-/ %% :-/ %%
|
||||
* :-\ %% :-\ %%
|
||||
* :-? %% :-? %%
|
||||
* :-D %% :-D %%
|
||||
* :-P %% :-P %%
|
||||
* :-O %% :-O %%
|
||||
* :-X %% :-X %%
|
||||
* :-| %% :-| %%
|
||||
* ;-) %% ;-) %%
|
||||
* ^_^ %% ^_^ %%
|
||||
* :?: %% :?: %%
|
||||
* :!: %% :!: %%
|
||||
* LOL %% LOL %%
|
||||
* FIXME %% FIXME %%
|
||||
* DELETEME %% DELETEME %%
|
||||
|
||||
==== Text to HTML Conversions ====
|
||||
|
||||
Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
|
||||
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
|
||||
<code>
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
</code>
|
||||
|
||||
The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
|
||||
|
||||
There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
|
||||
|
||||
===== Quoting =====
|
||||
|
||||
Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
|
||||
|
||||
<code>
|
||||
I think we should do it
|
||||
|
||||
> No we shouldn't
|
||||
|
||||
>> Well, I say we should
|
||||
|
||||
> Really?
|
||||
|
||||
>> Yes!
|
||||
|
||||
>>> Then lets do it!
|
||||
</code>
|
||||
|
||||
I think we should do it
|
||||
|
||||
> No we shouldn't
|
||||
|
||||
>> Well, I say we should
|
||||
|
||||
> Really?
|
||||
|
||||
>> Yes!
|
||||
|
||||
>>> Then lets do it!
|
||||
|
||||
===== Tables =====
|
||||
|
||||
DokuWiki supports a simple syntax to create tables.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | some colspan (note the double pipe) ||
|
||||
| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
|
||||
|
||||
Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | some colspan (note the double pipe) ||
|
||||
| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
|
||||
|
||||
To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
|
||||
|
||||
Vertical tableheaders are possible, too.
|
||||
|
||||
| ^ Heading 1 ^ Heading 2 ^
|
||||
^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
^ Heading 4 | no colspan this time | |
|
||||
^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
|
||||
|
||||
As you can see, it's the cell separator before a cell which decides about the formatting:
|
||||
|
||||
| ^ Heading 1 ^ Heading 2 ^
|
||||
^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
^ Heading 4 | no colspan this time | |
|
||||
^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
|
||||
|
||||
You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | ::: | Row 2 Col 3 |
|
||||
| Row 3 Col 1 | ::: | Row 2 Col 3 |
|
||||
|
||||
Apart from the rowspan syntax those cells should not contain anything else.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | ::: | Row 2 Col 3 |
|
||||
| Row 3 Col 1 | ::: | Row 2 Col 3 |
|
||||
|
||||
You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
|
||||
|
||||
^ Table with alignment ^^^
|
||||
| right| center |left |
|
||||
|left | right| center |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
This is how it looks in the source:
|
||||
|
||||
^ Table with alignment ^^^
|
||||
| right| center |left |
|
||||
|left | right| center |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
Note: Vertical alignment is not supported.
|
||||
|
||||
===== No Formatting =====
|
||||
|
||||
If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%<nowiki>%%'' tags or even simpler, with double percent signs ''<nowiki>%%</nowiki>''.
|
||||
|
||||
<nowiki>
|
||||
This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
|
||||
</nowiki>
|
||||
The same is true for %%//__this__ text// with a smiley ;-)%%.
|
||||
|
||||
<nowiki>
|
||||
This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
|
||||
</nowiki>
|
||||
The same is true for %%//__this__ text// with a smiley ;-)%%.
|
||||
|
||||
===== Code Blocks =====
|
||||
|
||||
You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%<code>%%'' or ''%%<file>%%''.
|
||||
|
||||
This is text is indented by two spaces.
|
||||
|
||||
<code>
|
||||
This is preformatted code all spaces are preserved: like <-this
|
||||
</code>
|
||||
|
||||
<file>
|
||||
This is pretty much the same, but you could use it to show that you quoted a file.
|
||||
</file>
|
||||
|
||||
Those blocks were created by this source:
|
||||
|
||||
This is text is indented by two spaces.
|
||||
|
||||
<code>
|
||||
This is preformatted code all spaces are preserved: like <-this
|
||||
</code>
|
||||
|
||||
<file>
|
||||
This is pretty much the same, but you could use it to show that you quoted a file.
|
||||
</file>
|
||||
|
||||
==== Syntax Highlighting ====
|
||||
|
||||
[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
|
||||
|
||||
<code java>
|
||||
/**
|
||||
* The HelloWorldApp class implements an application that
|
||||
* simply displays "Hello World!" to the standard output.
|
||||
*/
|
||||
class HelloWorldApp {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World!"); //Display the string.
|
||||
}
|
||||
}
|
||||
</code>
|
||||
|
||||
The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots roff rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql sshconfig standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch wolfram xbasic xml xojo xorg_conf xpp yaml z80 zxbasic//
|
||||
|
||||
There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
|
||||
|
||||
==== Downloadable Code Blocks ====
|
||||
|
||||
When you use the ''%%<code>%%'' or ''%%<file>%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this:
|
||||
|
||||
<code>
|
||||
<file php myexample.php>
|
||||
<?php echo "hello world!"; ?>
|
||||
</file>
|
||||
</code>
|
||||
|
||||
<file php myexample.php>
|
||||
<?php echo "hello world!"; ?>
|
||||
</file>
|
||||
|
||||
If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%<code - myfile.foo>%%''.
|
||||
|
||||
|
||||
===== Embedding HTML and PHP =====
|
||||
|
||||
You can embed raw HTML or PHP code into your documents by using the ''%%<html>%%'' or ''%%<php>%%'' tags. (Use uppercase tags if you need to enclose block level elements.)
|
||||
|
||||
HTML example:
|
||||
|
||||
<code>
|
||||
<html>
|
||||
This is some <span style="color:red;font-size:150%;">inline HTML</span>
|
||||
</html>
|
||||
<HTML>
|
||||
<p style="border:2px dashed red;">And this is some block HTML</p>
|
||||
</HTML>
|
||||
</code>
|
||||
|
||||
<html>
|
||||
This is some <span style="color:red;font-size:150%;">inline HTML</span>
|
||||
</html>
|
||||
<HTML>
|
||||
<p style="border:2px dashed red;">And this is some block HTML</p>
|
||||
</HTML>
|
||||
|
||||
PHP example:
|
||||
|
||||
<code>
|
||||
<php>
|
||||
echo 'The PHP version: ';
|
||||
echo phpversion();
|
||||
echo ' (generated inline HTML)';
|
||||
</php>
|
||||
<PHP>
|
||||
echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
|
||||
echo '<td>'.phpversion().'</td>';
|
||||
echo '</tr></table>';
|
||||
</PHP>
|
||||
</code>
|
||||
|
||||
<php>
|
||||
echo 'The PHP version: ';
|
||||
echo phpversion();
|
||||
echo ' (inline HTML)';
|
||||
</php>
|
||||
<PHP>
|
||||
echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
|
||||
echo '<td>'.phpversion().'</td>';
|
||||
echo '</tr></table>';
|
||||
</PHP>
|
||||
|
||||
**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed.
|
||||
|
||||
===== RSS/ATOM Feed Aggregation =====
|
||||
[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters:
|
||||
|
||||
^ Parameter ^ Description ^
|
||||
| any number | will be used as maximum number items to show, defaults to 8 |
|
||||
| reverse | display the last items in the feed first |
|
||||
| author | show item authors names |
|
||||
| date | show item dates |
|
||||
| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped |
|
||||
| nosort | do not sort the items in the feed |
|
||||
| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
|
||||
|
||||
The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
|
||||
|
||||
By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''.
|
||||
|
||||
**Example:**
|
||||
|
||||
{{rss>http://slashdot.org/index.rss 5 author date 1h }}
|
||||
|
||||
{{rss>http://slashdot.org/index.rss 5 author date 1h }}
|
||||
|
||||
|
||||
===== Control Macros =====
|
||||
|
||||
Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble:
|
||||
|
||||
^ Macro ^ Description |
|
||||
| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created |
|
||||
| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%<php>%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call |
|
||||
|
||||
===== Syntax Plugins =====
|
||||
|
||||
DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation:
|
||||
|
||||
~~INFO:syntaxplugins~~
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
====== TECH SAVIOURS wiki ======
|
||||
|
||||
The wiki is powered by [[https://www.dokuwiki.org/dokuwiki|DokuWiki]] in combination with the [[https://www.dokuwiki.org/template:bootstrap3?s[]=bootstrap3|Bootstrap3]] template.
|
||||
|
||||
===== Contributing to wiki =====
|
||||
|
||||
Like any open source project, it lives from the efforts of its users.
|
||||
|
||||
The documentation can always be improved, or you can create more tutorials. But they must be easy to read and generally understandable to a complete newcomer who want more digital privacy but don't know how to achieve it.
|
||||
|
||||
===== GitHub or registration =====
|
||||
|
||||
<alert type="danger">{{icon>exclamation}} GitHub currently not working.</alert>
|
||||
The normal procedure fork/pull requests on [[https://github.com/TECH-SAVIOURS-ORG/wiki/|GitHub]] or send us an email to [[wiki@techsaviours.org?Subject=Registration%20Request|wiki@techsaviours.org]] if you prefer to register on the [[https://wiki.techsaviours.org|wiki website]] itself, as we do not have registration enabled.
|
||||
|
||||
===== Syntax =====
|
||||
|
||||
You can use the [[en:wiki:syntax|DokuWiki's syntax]]. We tried to implement [[https://www.markdownguide.org/cheat-sheet/|Markdown]], but unfortunately it doesn't really work. Too many failures with plugins or core.
|
||||
|
||||
===== Structure =====
|
||||
|
||||
The wiki is mainly structured in 4 parts ([[https://www.dokuwiki.org/namespaces|namespaces]]):
|
||||
* Server
|
||||
* Operating Systems
|
||||
* Services
|
||||
* Phone
|
||||
* Operating Systems
|
||||
* Apps
|
||||
* Desktop
|
||||
* Operating Systems
|
||||
* Services
|
||||
* Extras
|
||||
|
||||
There is also ''faq'' and probably more will follow.
|
||||
|
||||
If the tutorials are the same (e.g. desktop and server), create the page and add a link to it
|
||||
|
||||
<code>{{page>en:server:services:name}}</code>
|
||||
|
||||
<alert type="warning">{{icon>info}} Always add the link from the desktop to the server. This makes it easier to change the tutorials in the future.</alert>
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
* [[en:wiki|WIKI]]
|
||||
* [[https://techsaviours.org|HOME]]
|
||||
* [[https://techsaviours.org/news|NEWS]]
|
||||
* [[https://techsaviours.org/#services|WHY?]]
|
||||
* [[https://techsaviours.org/#tutorials|TUTORIALS]]
|
||||
* [[https://techsaviours.org/#freeservices|SERVICES]]
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
<markdown>
|
||||
# Get back your privacy
|
||||
|
||||
</markdown>
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
~~NOCACHE~~
|
||||
|
||||
=== Tutorials ===
|
||||
* [[:en:server|Server]]
|
||||
* [[:en:server:operating_systems|Operating Systems]]
|
||||
* [[:en:server:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:en:server:services|Services]]
|
||||
* [[:en:server:services:searx|Searx]]
|
||||
* [[:en:phone|Phone]]
|
||||
* [[:en:phone:operating_systems|Operating Systems]]
|
||||
* [[:en:phone:operating_systems:android|Android]]
|
||||
* [[:en:phone:apps|Apps]]
|
||||
* [[:en:phone:apps:magisk|Magisk]]
|
||||
* [[:en:desktop|Desktop]]
|
||||
* [[:en:desktop:operating_systems|Operating Systems]]
|
||||
* [[:en:desktop:operating_systems:arch_linux|Arch Linux]]
|
||||
* [[:en:desktop:services|Services]]
|
||||
* [[:en:desktop:services:dnscrypt|DNSCrypt]]
|
||||
* [[:en:desktop:services:searx|Searx]]
|
||||
* [[:en:backup|Backup]]
|
||||
* [[:en:backup:server|Server]]
|
||||
* [[:en:backup:phone|Phone]]
|
||||
* [[:en:backup:desktop|Desktop]]
|
||||
* [[:en:extras|Extras]]
|
||||
* [[:en:faq|FAQ]]
|
||||
|
||||
=== Contributing ===
|
||||
* [[:en:wiki:wikirules|Contributing to wiki]]
|
||||
|
||||
=== Miscellaneous ===
|
||||
* [[:en:wiki:dokuwiki|About DokuWiki]]
|
||||
* [[:en:wiki:syntax|DokuWiki syntax]]
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
====== Welcome to TECH SAVIOURS Wiki ======
|
||||
We would like to give you the opportunity here to achieve your digital privacy goals as a DIY solution. We cover the most important devices we use every day.
|
||||
|
||||
So feel free to follow the tutorials and get your digital privacy under control and share only what you really want to share.
|
||||
|
||||
====== Contributing ======
|
||||
If you are interested in adding more devices or making some improvements, see our [[en:wiki:wikirules|wiki rules]].
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
====== DokuWiki ======
|
||||
|
||||
[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a simple to use and highly versatile Open Source [[wp>wiki]] software that doesn't require a database. It is loved by users for its clean and readable [[wiki:syntax]]. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in [[doku>acl|access controls]] and [[doku>auth|authentication connectors]] make DokuWiki especially useful in the enterprise context and the large number of [[doku>plugins]] contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.
|
||||
|
||||
Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
|
||||
|
||||
===== Download =====
|
||||
|
||||
DokuWiki is available at https://download.dokuwiki.org/
|
||||
|
||||
|
||||
===== Read More =====
|
||||
|
||||
All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]].
|
||||
|
||||
**About DokuWiki**
|
||||
|
||||
* [[doku>features|A feature list]] :!:
|
||||
* [[doku>users|Happy Users]]
|
||||
* [[doku>press|Who wrote about it]]
|
||||
* [[doku>blogroll|What Bloggers think]]
|
||||
* [[https://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]]
|
||||
|
||||
**Installing DokuWiki**
|
||||
|
||||
* [[doku>requirements|System Requirements]]
|
||||
* [[https://download.dokuwiki.org/|Download DokuWiki]] :!:
|
||||
* [[doku>changes|Change Log]]
|
||||
* [[doku>Install|How to install or upgrade]] :!:
|
||||
* [[doku>config|Configuration]]
|
||||
|
||||
**Using DokuWiki**
|
||||
|
||||
* [[doku>syntax|Wiki Syntax]]
|
||||
* [[doku>manual|The manual]] :!:
|
||||
* [[doku>FAQ|Frequently Asked Questions (FAQ)]]
|
||||
* [[doku>glossary|Glossary]]
|
||||
|
||||
**Customizing DokuWiki**
|
||||
|
||||
* [[doku>tips|Tips and Tricks]]
|
||||
* [[doku>Template|How to create and use templates]]
|
||||
* [[doku>plugins|Installing plugins]]
|
||||
* [[doku>development|Development Resources]]
|
||||
|
||||
**DokuWiki Feedback and Community**
|
||||
|
||||
* [[doku>newsletter|Subscribe to the newsletter]] :!:
|
||||
* [[doku>mailinglist|Join the mailing list]]
|
||||
* [[https://forum.dokuwiki.org|Check out the user forum]]
|
||||
* [[doku>irc|Talk to other users in the IRC channel]]
|
||||
* [[https://github.com/splitbrain/dokuwiki/issues|Submit bugs and feature wishes]]
|
||||
* [[doku>thanks|Some humble thanks]]
|
||||
|
||||
|
||||
===== Copyright =====
|
||||
|
||||
2004-2020 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[https://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community
|
||||
|
||||
The DokuWiki engine is licensed under [[https://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-).
|
||||
|
||||
Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]].
|
||||
|
|
@ -0,0 +1,525 @@
|
|||
====== Formatting Syntax ======
|
||||
|
||||
[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing "Edit this page". If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too.
|
||||
|
||||
===== Basic Text Formatting =====
|
||||
|
||||
DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these.
|
||||
|
||||
DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts.
|
||||
Of course you can **__//''combine''//__** all these.
|
||||
|
||||
You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
|
||||
|
||||
You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
|
||||
|
||||
You can mark something as <del>deleted</del> as well.
|
||||
|
||||
You can mark something as <del>deleted</del> as well.
|
||||
|
||||
**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line.
|
||||
|
||||
This is some text with some linebreaks\\ Note that the
|
||||
two backslashes are only recognized at the end of a line\\
|
||||
or followed by\\ a whitespace \\this happens without it.
|
||||
|
||||
This is some text with some linebreaks\\ Note that the
|
||||
two backslashes are only recognized at the end of a line\\
|
||||
or followed by\\ a whitespace \\this happens without it.
|
||||
|
||||
You should use forced newlines only if really needed.
|
||||
|
||||
===== Links =====
|
||||
|
||||
DokuWiki supports multiple ways of creating links.
|
||||
|
||||
==== External ====
|
||||
|
||||
External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: <andi@splitbrain.org> are recognized, too.
|
||||
|
||||
DokuWiki supports multiple ways of creating links. External links are recognized
|
||||
automagically: http://www.google.com or simply www.google.com - You can set
|
||||
link text as well: [[http://www.google.com|This Link points to google]]. Email
|
||||
addresses like this one: <andi@splitbrain.org> are recognized, too.
|
||||
|
||||
==== Internal ====
|
||||
|
||||
Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]].
|
||||
|
||||
Internal links are created by using square brackets. You can either just give
|
||||
a [[pagename]] or use an additional [[pagename|link text]].
|
||||
|
||||
[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed.
|
||||
|
||||
You can use [[some:namespaces]] by using a colon in the pagename.
|
||||
|
||||
You can use [[some:namespaces]] by using a colon in the pagename.
|
||||
|
||||
For details about namespaces see [[doku>namespaces]].
|
||||
|
||||
Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]].
|
||||
|
||||
This links to [[syntax#internal|this Section]].
|
||||
|
||||
Notes:
|
||||
|
||||
* Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones.
|
||||
* DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled.
|
||||
* When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much.
|
||||
|
||||
==== Interwiki ====
|
||||
|
||||
DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
|
||||
|
||||
DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis.
|
||||
For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
|
||||
|
||||
==== Windows Shares ====
|
||||
|
||||
Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]].
|
||||
|
||||
Windows Shares like [[\\server\share|this]] are recognized, too.
|
||||
|
||||
Notes:
|
||||
|
||||
* For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
|
||||
* For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/lang/en/lang.php'' (more details at [[doku>localization#changing_some_localized_texts_and_strings_in_your_installation|localization]]): <code - conf/lang/en/lang.php>
|
||||
<?php
|
||||
/**
|
||||
* Customization of the english language file
|
||||
* Copy only the strings that needs to be modified
|
||||
*/
|
||||
$lang['js']['nosmblinks'] = '';
|
||||
</code>
|
||||
|
||||
==== Image Links ====
|
||||
|
||||
You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this:
|
||||
|
||||
[[http://php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
[[http://php.net|{{wiki:dokuwiki-128.png}}]]
|
||||
|
||||
Please note: The image formatting is the only formatting syntax accepted in link names.
|
||||
|
||||
The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links).
|
||||
|
||||
===== Footnotes =====
|
||||
|
||||
You can add footnotes ((This is a footnote)) by using double parentheses.
|
||||
|
||||
You can add footnotes ((This is a footnote)) by using double parentheses.
|
||||
|
||||
===== Sectioning =====
|
||||
|
||||
You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''<nowiki>~~NOTOC~~</nowiki>'' in the document.
|
||||
|
||||
==== Headline Level 3 ====
|
||||
=== Headline Level 4 ===
|
||||
== Headline Level 5 ==
|
||||
|
||||
==== Headline Level 3 ====
|
||||
=== Headline Level 4 ===
|
||||
== Headline Level 5 ==
|
||||
|
||||
By using four or more dashes, you can make a horizontal line:
|
||||
|
||||
----
|
||||
|
||||
===== Media Files =====
|
||||
|
||||
You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them.
|
||||
|
||||
Real size: {{wiki:dokuwiki-128.png}}
|
||||
|
||||
Resize to given width: {{wiki:dokuwiki-128.png?50}}
|
||||
|
||||
Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
|
||||
|
||||
Resized external image: {{https://secure.php.net/images/php.gif?200x50}}
|
||||
|
||||
Real size: {{wiki:dokuwiki-128.png}}
|
||||
Resize to given width: {{wiki:dokuwiki-128.png?50}}
|
||||
Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
|
||||
Resized external image: {{https://secure.php.net/images/php.gif?200x50}}
|
||||
|
||||
|
||||
By using left or right whitespaces you can choose the alignment.
|
||||
|
||||
{{ wiki:dokuwiki-128.png}}
|
||||
|
||||
{{wiki:dokuwiki-128.png }}
|
||||
|
||||
{{ wiki:dokuwiki-128.png }}
|
||||
|
||||
{{ wiki:dokuwiki-128.png}}
|
||||
{{wiki:dokuwiki-128.png }}
|
||||
{{ wiki:dokuwiki-128.png }}
|
||||
|
||||
Of course, you can add a title (displayed as a tooltip by most browsers), too.
|
||||
|
||||
{{ wiki:dokuwiki-128.png |This is the caption}}
|
||||
|
||||
{{ wiki:dokuwiki-128.png |This is the caption}}
|
||||
|
||||
For linking an image to another page see [[#Image Links]] above.
|
||||
|
||||
==== Supported Media Formats ====
|
||||
|
||||
DokuWiki can embed the following media formats directly.
|
||||
|
||||
| Image | ''gif'', ''jpg'', ''png'' |
|
||||
| Video | ''webm'', ''ogv'', ''mp4'' |
|
||||
| Audio | ''ogg'', ''mp3'', ''wav'' |
|
||||
| Flash | ''swf'' |
|
||||
|
||||
If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
|
||||
|
||||
By adding ''?linkonly'' you provide a link to the media without displaying it inline
|
||||
|
||||
{{wiki:dokuwiki-128.png?linkonly}}
|
||||
|
||||
{{wiki:dokuwiki-128.png?linkonly}} This is just a link to the image.
|
||||
|
||||
==== Fallback Formats ====
|
||||
|
||||
Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
|
||||
|
||||
For example consider this embedded mp4 video:
|
||||
|
||||
{{video.mp4|A funny video}}
|
||||
|
||||
When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser.
|
||||
|
||||
Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work.
|
||||
|
||||
===== Lists =====
|
||||
|
||||
Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones.
|
||||
|
||||
* This is a list
|
||||
* The second item
|
||||
* You may have different levels
|
||||
* Another item
|
||||
|
||||
- The same list but ordered
|
||||
- Another item
|
||||
- Just use indention for deeper levels
|
||||
- That's it
|
||||
|
||||
<code>
|
||||
* This is a list
|
||||
* The second item
|
||||
* You may have different levels
|
||||
* Another item
|
||||
|
||||
- The same list but ordered
|
||||
- Another item
|
||||
- Just use indention for deeper levels
|
||||
- That's it
|
||||
</code>
|
||||
|
||||
Also take a look at the [[doku>faq:lists|FAQ on list items]].
|
||||
|
||||
===== Text Conversions =====
|
||||
|
||||
DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML.
|
||||
|
||||
The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well.
|
||||
|
||||
==== Text to Image Conversions ====
|
||||
|
||||
DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki:
|
||||
|
||||
* 8-) %% 8-) %%
|
||||
* 8-O %% 8-O %%
|
||||
* :-( %% :-( %%
|
||||
* :-) %% :-) %%
|
||||
* =) %% =) %%
|
||||
* :-/ %% :-/ %%
|
||||
* :-\ %% :-\ %%
|
||||
* :-? %% :-? %%
|
||||
* :-D %% :-D %%
|
||||
* :-P %% :-P %%
|
||||
* :-O %% :-O %%
|
||||
* :-X %% :-X %%
|
||||
* :-| %% :-| %%
|
||||
* ;-) %% ;-) %%
|
||||
* ^_^ %% ^_^ %%
|
||||
* :?: %% :?: %%
|
||||
* :!: %% :!: %%
|
||||
* LOL %% LOL %%
|
||||
* FIXME %% FIXME %%
|
||||
* DELETEME %% DELETEME %%
|
||||
|
||||
==== Text to HTML Conversions ====
|
||||
|
||||
Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
|
||||
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
|
||||
<code>
|
||||
-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
|
||||
"He thought 'It's a man's world'..."
|
||||
</code>
|
||||
|
||||
The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
|
||||
|
||||
There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
|
||||
|
||||
===== Quoting =====
|
||||
|
||||
Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
|
||||
|
||||
<code>
|
||||
I think we should do it
|
||||
|
||||
> No we shouldn't
|
||||
|
||||
>> Well, I say we should
|
||||
|
||||
> Really?
|
||||
|
||||
>> Yes!
|
||||
|
||||
>>> Then lets do it!
|
||||
</code>
|
||||
|
||||
I think we should do it
|
||||
|
||||
> No we shouldn't
|
||||
|
||||
>> Well, I say we should
|
||||
|
||||
> Really?
|
||||
|
||||
>> Yes!
|
||||
|
||||
>>> Then lets do it!
|
||||
|
||||
===== Tables =====
|
||||
|
||||
DokuWiki supports a simple syntax to create tables.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | some colspan (note the double pipe) ||
|
||||
| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
|
||||
|
||||
Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | some colspan (note the double pipe) ||
|
||||
| Row 3 Col 1 | Row 3 Col 2 | Row 3 Col 3 |
|
||||
|
||||
To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
|
||||
|
||||
Vertical tableheaders are possible, too.
|
||||
|
||||
| ^ Heading 1 ^ Heading 2 ^
|
||||
^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
^ Heading 4 | no colspan this time | |
|
||||
^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
|
||||
|
||||
As you can see, it's the cell separator before a cell which decides about the formatting:
|
||||
|
||||
| ^ Heading 1 ^ Heading 2 ^
|
||||
^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 |
|
||||
^ Heading 4 | no colspan this time | |
|
||||
^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 |
|
||||
|
||||
You can have rowspans (vertically connected cells) by adding ''%%:::%%'' into the cells below the one to which they should connect.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | ::: | Row 2 Col 3 |
|
||||
| Row 3 Col 1 | ::: | Row 2 Col 3 |
|
||||
|
||||
Apart from the rowspan syntax those cells should not contain anything else.
|
||||
|
||||
^ Heading 1 ^ Heading 2 ^ Heading 3 ^
|
||||
| Row 1 Col 1 | this cell spans vertically | Row 1 Col 3 |
|
||||
| Row 2 Col 1 | ::: | Row 2 Col 3 |
|
||||
| Row 3 Col 1 | ::: | Row 2 Col 3 |
|
||||
|
||||
You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
|
||||
|
||||
^ Table with alignment ^^^
|
||||
| right| center |left |
|
||||
|left | right| center |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
This is how it looks in the source:
|
||||
|
||||
^ Table with alignment ^^^
|
||||
| right| center |left |
|
||||
|left | right| center |
|
||||
| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
|
||||
|
||||
Note: Vertical alignment is not supported.
|
||||
|
||||
===== No Formatting =====
|
||||
|
||||
If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%<nowiki>%%'' tags or even simpler, with double percent signs ''<nowiki>%%</nowiki>''.
|
||||
|
||||
<nowiki>
|
||||
This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
|
||||
</nowiki>
|
||||
The same is true for %%//__this__ text// with a smiley ;-)%%.
|
||||
|
||||
<nowiki>
|
||||
This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
|
||||
</nowiki>
|
||||
The same is true for %%//__this__ text// with a smiley ;-)%%.
|
||||
|
||||
===== Code Blocks =====
|
||||
|
||||
You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%<code>%%'' or ''%%<file>%%''.
|
||||
|
||||
This is text is indented by two spaces.
|
||||
|
||||
<code>
|
||||
This is preformatted code all spaces are preserved: like <-this
|
||||
</code>
|
||||
|
||||
<file>
|
||||
This is pretty much the same, but you could use it to show that you quoted a file.
|
||||
</file>
|
||||
|
||||
Those blocks were created by this source:
|
||||
|
||||
This is text is indented by two spaces.
|
||||
|
||||
<code>
|
||||
This is preformatted code all spaces are preserved: like <-this
|
||||
</code>
|
||||
|
||||
<file>
|
||||
This is pretty much the same, but you could use it to show that you quoted a file.
|
||||
</file>
|
||||
|
||||
==== Syntax Highlighting ====
|
||||
|
||||
[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
|
||||
|
||||
<code java>
|
||||
/**
|
||||
* The HelloWorldApp class implements an application that
|
||||
* simply displays "Hello World!" to the standard output.
|
||||
*/
|
||||
class HelloWorldApp {
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Hello World!"); //Display the string.
|
||||
}
|
||||
}
|
||||
</code>
|
||||
|
||||
The following language strings are currently recognized: //4cs 6502acme 6502kickass 6502tasm 68000devpac abap actionscript3 actionscript ada aimms algol68 apache applescript apt_sources arm asm asp asymptote autoconf autohotkey autoit avisynth awk bascomavr bash basic4gl batch bf biblatex bibtex blitzbasic bnf boo caddcl cadlisp ceylon cfdg cfm chaiscript chapel cil c_loadrunner clojure c_mac cmake cobol coffeescript c cpp cpp-qt cpp-winapi csharp css cuesheet c_winapi dart dcl dcpu16 dcs delphi diff div dos dot d ecmascript eiffel email epc e erlang euphoria ezt f1 falcon fo fortran freebasic freeswitch fsharp gambas gdb genero genie gettext glsl gml gnuplot go groovy gwbasic haskell haxe hicest hq9plus html html4strict html5 icon idl ini inno intercal io ispfpanel java5 java javascript jcl j jquery julia kixtart klonec klonecpp kotlin latex lb ldif lisp llvm locobasic logtalk lolcode lotusformulas lotusscript lscript lsl2 lua m68k magiksf make mapbasic mathematica matlab mercury metapost mirc mk-61 mmix modula2 modula3 mpasm mxml mysql nagios netrexx newlisp nginx nimrod nsis oberon2 objc objeck ocaml-brief ocaml octave oobas oorexx oracle11 oracle8 oxygene oz parasail parigp pascal pcre perl6 perl per pf phix php-brief php pic16 pike pixelbender pli plsql postgresql postscript povray powerbuilder powershell proftpd progress prolog properties providex purebasic pycon pys60 python qbasic qml q racket rails rbs rebol reg rexx robots roff rpmspec rsplus ruby rust sas sass scala scheme scilab scl sdlbasic smalltalk smarty spark sparql sql sshconfig standardml stonescript swift systemverilog tclegg tcl teraterm texgraph text thinbasic tsql twig typoscript unicon upc urbi uscript vala vbnet vb vbscript vedit verilog vhdl vim visualfoxpro visualprolog whitespace whois winbatch wolfram xbasic xml xojo xorg_conf xpp yaml z80 zxbasic//
|
||||
|
||||
There are additional [[doku>syntax_highlighting|advanced options]] available for syntax highlighting, such as highlighting lines or adding line numbers.
|
||||
|
||||
==== Downloadable Code Blocks ====
|
||||
|
||||
When you use the ''%%<code>%%'' or ''%%<file>%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this:
|
||||
|
||||
<code>
|
||||
<file php myexample.php>
|
||||
<?php echo "hello world!"; ?>
|
||||
</file>
|
||||
</code>
|
||||
|
||||
<file php myexample.php>
|
||||
<?php echo "hello world!"; ?>
|
||||
</file>
|
||||
|
||||
If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%<code - myfile.foo>%%''.
|
||||
|
||||
|
||||
===== Embedding HTML and PHP =====
|
||||
|
||||
You can embed raw HTML or PHP code into your documents by using the ''%%<html>%%'' or ''%%<php>%%'' tags. (Use uppercase tags if you need to enclose block level elements.)
|
||||
|
||||
HTML example:
|
||||
|
||||
<code>
|
||||
<html>
|
||||
This is some <span style="color:red;font-size:150%;">inline HTML</span>
|
||||
</html>
|
||||
<HTML>
|
||||
<p style="border:2px dashed red;">And this is some block HTML</p>
|
||||
</HTML>
|
||||
</code>
|
||||
|
||||
<html>
|
||||
This is some <span style="color:red;font-size:150%;">inline HTML</span>
|
||||
</html>
|
||||
<HTML>
|
||||
<p style="border:2px dashed red;">And this is some block HTML</p>
|
||||
</HTML>
|
||||
|
||||
PHP example:
|
||||
|
||||
<code>
|
||||
<php>
|
||||
echo 'The PHP version: ';
|
||||
echo phpversion();
|
||||
echo ' (generated inline HTML)';
|
||||
</php>
|
||||
<PHP>
|
||||
echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
|
||||
echo '<td>'.phpversion().'</td>';
|
||||
echo '</tr></table>';
|
||||
</PHP>
|
||||
</code>
|
||||
|
||||
<php>
|
||||
echo 'The PHP version: ';
|
||||
echo phpversion();
|
||||
echo ' (inline HTML)';
|
||||
</php>
|
||||
<PHP>
|
||||
echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
|
||||
echo '<td>'.phpversion().'</td>';
|
||||
echo '</tr></table>';
|
||||
</PHP>
|
||||
|
||||
**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed.
|
||||
|
||||
===== RSS/ATOM Feed Aggregation =====
|
||||
[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters:
|
||||
|
||||
^ Parameter ^ Description ^
|
||||
| any number | will be used as maximum number items to show, defaults to 8 |
|
||||
| reverse | display the last items in the feed first |
|
||||
| author | show item authors names |
|
||||
| date | show item dates |
|
||||
| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped |
|
||||
| nosort | do not sort the items in the feed |
|
||||
| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
|
||||
|
||||
The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
|
||||
|
||||
By default the feed will be sorted by date, newest items first. You can sort it by oldest first using the ''reverse'' parameter, or display the feed as is with ''nosort''.
|
||||
|
||||
**Example:**
|
||||
|
||||
{{rss>http://slashdot.org/index.rss 5 author date 1h }}
|
||||
|
||||
{{rss>http://slashdot.org/index.rss 5 author date 1h }}
|
||||
|
||||
|
||||
===== Control Macros =====
|
||||
|
||||
Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble:
|
||||
|
||||
^ Macro ^ Description |
|
||||
| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created |
|
||||
| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%<php>%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call |
|
||||
|
||||
===== Syntax Plugins =====
|
||||
|
||||
DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation:
|
||||
|
||||
~~INFO:syntaxplugins~~
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
====== Welcome to your new DokuWiki ======
|
||||
|
||||
Congratulations, your wiki is now up and running. Here are a few more tips to get you started.
|
||||
|
||||
Enjoy your work with DokuWiki,\\
|
||||
-- the developers
|
||||
|
||||
===== Create your first pages =====
|
||||
|
||||
Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]].
|
||||
|
||||
Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]].
|
||||
|
||||
You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more.
|
||||
|
||||
Please be aware that not all templates support sidebars.
|
||||
|
||||
===== Customize your Wiki =====
|
||||
|
||||
Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first).
|
||||
|
||||
You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation.
|
||||
|
||||
===== Join the Community =====
|
||||
|
||||
DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]].
|
||||
|
||||
The [[https://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]].
|
||||
|
||||
Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki.
|
||||
Loading…
Reference in New Issue