diff options
author | onefang | 2021-09-09 12:30:24 +1000 |
---|---|---|
committer | onefang | 2021-09-09 12:30:24 +1000 |
commit | 5e05f276c5ea784df0de86d70bf7aab2e5de32d5 (patch) | |
tree | ae0b057c8e50ad486102c2a8dabc293d8a0a9bfd /example | |
parent | Remove various empty example directories that are auto created now. (diff) | |
download | opensim-SC-5e05f276c5ea784df0de86d70bf7aab2e5de32d5.zip opensim-SC-5e05f276c5ea784df0de86d70bf7aab2e5de32d5.tar.gz opensim-SC-5e05f276c5ea784df0de86d70bf7aab2e5de32d5.tar.bz2 opensim-SC-5e05f276c5ea784df0de86d70bf7aab2e5de32d5.tar.xz |
Rejig the web stuff.
Move to examples to example/var/www.
Move the web socket to scRoot/var/run.
Make the name of the web socket configurable.
Populate the scRoot/var/www from exomples if it's empty.
Everyone uses SledjChisl.css now.
Some clean ups.
Comment++
Diffstat (limited to 'example')
17 files changed, 152 insertions, 186 deletions
diff --git a/example/etc/apache2/sledjchisl.fcgi.conf b/example/etc/apache2/sledjchisl.fcgi.conf index 95458cd..06002bd 100644 --- a/example/etc/apache2/sledjchisl.fcgi.conf +++ b/example/etc/apache2/sledjchisl.fcgi.conf | |||
@@ -11,8 +11,11 @@ LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so | |||
11 | AllowOverride All | 11 | AllowOverride All |
12 | </Directory> | 12 | </Directory> |
13 | 13 | ||
14 | |||
15 | # Any request ENDING in .fcgi gets passed to that unix:...socket, piped as FGCI protocol to localhost. | ||
16 | # That last bit isn't documented, this helped - https://www.linuxquestions.org/questions/linux-server-73/understanding-apache-proxy-unix-sockets-with-pipe-localhost-4175627589/ | ||
14 | <FilesMatch "\.fcgi$"> | 17 | <FilesMatch "\.fcgi$"> |
15 | SetHandler "proxy:unix:///opt/opensim_SC/caches/sledjchisl.socket|fcgi://localhost/" | 18 | SetHandler "proxy:unix:///opt/opensim_SC/var/run/sledjchisl.socket|fcgi://localhost/" |
16 | </FilesMatch> | 19 | </FilesMatch> |
17 | 20 | ||
18 | ErrorLog ${APACHE_LOG_DIR}/error.log | 21 | ErrorLog ${APACHE_LOG_DIR}/error.log |
@@ -31,7 +34,7 @@ LoadModule proxy_fcgi_module /usr/lib/apache2/modules/mod_proxy_fcgi.so | |||
31 | </Directory> | 34 | </Directory> |
32 | 35 | ||
33 | <FilesMatch "\.fcgi$"> | 36 | <FilesMatch "\.fcgi$"> |
34 | SetHandler "proxy:unix:///opt/opensim_SC/caches/sledjchisl.socket|fcgi://localhost/" | 37 | SetHandler "proxy:unix:///opt/opensim_SC/var/run/sledjchisl.socket|fcgi://localhost/" |
35 | </FilesMatch> | 38 | </FilesMatch> |
36 | </VirtualHost> | 39 | </VirtualHost> |
37 | </IfModule> | 40 | </IfModule> |
diff --git a/example/var/www/html/SledjChisl.css b/example/var/www/html/SledjChisl.css new file mode 100644 index 0000000..95b55cb --- /dev/null +++ b/example/var/www/html/SledjChisl.css | |||
@@ -0,0 +1,89 @@ | |||
1 | html, body | ||
2 | { | ||
3 | background-color: black; | ||
4 | color: white; | ||
5 | font-family: 'sans-serif'; | ||
6 | margin: 0; | ||
7 | padding: 0; | ||
8 | } | ||
9 | |||
10 | a {color: aqua;} | ||
11 | a:link {color: aqua;} | ||
12 | a:visited {color: fuchsia;} | ||
13 | a:hover {color: blue;} | ||
14 | a:active {color: red;} | ||
15 | |||
16 | button | ||
17 | { | ||
18 | background-color: darkgreen; | ||
19 | color: white; | ||
20 | font-family: 'sans-serif'; | ||
21 | } | ||
22 | button:hover {color: blue;} | ||
23 | button:active {color: red;} | ||
24 | |||
25 | label | ||
26 | { | ||
27 | background-color:darkgreen; | ||
28 | color: white; | ||
29 | font-family: 'sans-serif'; | ||
30 | font-size: 160%; | ||
31 | } | ||
32 | input | ||
33 | { | ||
34 | background-color:darkblue; | ||
35 | color: white; | ||
36 | font-family: 'sans-serif'; | ||
37 | font-size: 80%; | ||
38 | } | ||
39 | textarea | ||
40 | { | ||
41 | background-color:darkblue; | ||
42 | color: white; | ||
43 | font-family: 'sans-serif'; | ||
44 | font-size: 80%; | ||
45 | /* What idiot thought aligning the label with the bottom of textareas was a good default? */ | ||
46 | vertical-align: top; | ||
47 | } | ||
48 | |||
49 | .container | ||
50 | { | ||
51 | position: relative; | ||
52 | text-align: left; | ||
53 | } | ||
54 | .top-left | ||
55 | { | ||
56 | position: absolute; | ||
57 | top: 8px; | ||
58 | left: 16px; | ||
59 | width: 30%; | ||
60 | } | ||
61 | .top-right | ||
62 | { | ||
63 | position: absolute; | ||
64 | top: 8px; | ||
65 | right: 16px; | ||
66 | width: 30%; | ||
67 | } | ||
68 | .centre | ||
69 | { | ||
70 | position: absolute; | ||
71 | top: 50%; | ||
72 | left: 50%; | ||
73 | width: 30%; | ||
74 | transform: translate(-50%, -50%); | ||
75 | } | ||
76 | .bottom-left | ||
77 | { | ||
78 | position: absolute; | ||
79 | bottom: 8px; | ||
80 | left: 16px; | ||
81 | width: 30%; | ||
82 | } | ||
83 | .bottom-right | ||
84 | { | ||
85 | position: absolute; | ||
86 | bottom: 8px; | ||
87 | right: 16px; | ||
88 | width: 30%; | ||
89 | } | ||
diff --git a/example/www/SledjHamr.png b/example/var/www/html/SledjHamr.png index 9089573..9089573 100644 --- a/example/www/SledjHamr.png +++ b/example/var/www/html/SledjHamr.png | |||
Binary files differ | |||
diff --git a/example/www/SledjHamrIcon.png b/example/var/www/html/SledjHamrIcon.png index e3b50e1..e3b50e1 100644 --- a/example/www/SledjHamrIcon.png +++ b/example/var/www/html/SledjHamrIcon.png | |||
Binary files differ | |||
diff --git a/example/www/SledjHamrIconSmall.png b/example/var/www/html/SledjHamrIconSmall.png index a1a6d72..a1a6d72 100644 --- a/example/www/SledjHamrIconSmall.png +++ b/example/var/www/html/SledjHamrIconSmall.png | |||
Binary files differ | |||
diff --git a/example/var/www/html/about.html b/example/var/www/html/about.html new file mode 100644 index 0000000..7294c21 --- /dev/null +++ b/example/var/www/html/about.html | |||
@@ -0,0 +1,13 @@ | |||
1 | <html> | ||
2 | <title>About this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | <link type='text/css' rel='stylesheet' href='SledjChisl.css' media='all' /> | ||
7 | <meta http-equiv="refresh" content="120"> | ||
8 | </head> | ||
9 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> | ||
10 | <p>This is a virtual world, usually called a grid, based on <a href="https://sledjhamr.org/cgit/opensim-SC/?h=SledjChisl">opensim-SC</a>.</p> | ||
11 | <p> </p> | ||
12 | </body> | ||
13 | </html> | ||
diff --git a/example/www/debugStyle.css b/example/var/www/html/debugStyle.css index 98645cc..98645cc 100644 --- a/example/www/debugStyle.css +++ b/example/var/www/html/debugStyle.css | |||
diff --git a/example/var/www/html/help.html b/example/var/www/html/help.html new file mode 100644 index 0000000..17022d8 --- /dev/null +++ b/example/var/www/html/help.html | |||
@@ -0,0 +1,13 @@ | |||
1 | <html> | ||
2 | <title>Help for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | <link type='text/css' rel='stylesheet' href='SledjChisl.css' media='all' /> | ||
7 | <meta http-equiv="refresh" content="120"> | ||
8 | </head> | ||
9 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> | ||
10 | <p>Include help for your grid here.</p> | ||
11 | <p> </p> | ||
12 | </body> | ||
13 | </html> | ||
diff --git a/example/www/loginpage.html b/example/var/www/html/loginpage.html index 7a221dc..38d5761 100644 --- a/example/www/loginpage.html +++ b/example/var/www/html/loginpage.html | |||
@@ -4,66 +4,7 @@ | |||
4 | <meta charset="UTF-8"> | 4 | <meta charset="UTF-8"> |
5 | <link rel="shortcut icon" href="/SledjHamrIconSmall.png"> | 5 | <link rel="shortcut icon" href="/SledjHamrIconSmall.png"> |
6 | <meta http-equiv="refresh" content="120"> | 6 | <meta http-equiv="refresh" content="120"> |
7 | <style> | 7 | <link type="text/css" rel="stylesheet" href="/SledjChisl.css" media="all" /> |
8 | html, body | ||
9 | { | ||
10 | margin: 0; | ||
11 | padding: 0; | ||
12 | color: white; | ||
13 | } | ||
14 | a {color: green;} | ||
15 | a:link {color: green;} | ||
16 | a:visited {color: purple;} | ||
17 | a:hover {color: red;} | ||
18 | a:active {color: blue;} | ||
19 | |||
20 | .container | ||
21 | { | ||
22 | position: relative; | ||
23 | text-align: left; | ||
24 | } | ||
25 | |||
26 | .top-left | ||
27 | { | ||
28 | position: absolute; | ||
29 | top: 8px; | ||
30 | left: 16px; | ||
31 | width: 30%; | ||
32 | } | ||
33 | |||
34 | .top-right | ||
35 | { | ||
36 | position: absolute; | ||
37 | top: 8px; | ||
38 | right: 16px; | ||
39 | width: 30%; | ||
40 | } | ||
41 | |||
42 | .centre | ||
43 | { | ||
44 | position: absolute; | ||
45 | top: 50%; | ||
46 | left: 50%; | ||
47 | width: 30%; | ||
48 | transform: translate(-50%, -50%); | ||
49 | } | ||
50 | |||
51 | .bottom-left | ||
52 | { | ||
53 | position: absolute; | ||
54 | bottom: 8px; | ||
55 | left: 16px; | ||
56 | width: 30%; | ||
57 | } | ||
58 | |||
59 | .bottom-right | ||
60 | { | ||
61 | position: absolute; | ||
62 | bottom: 8px; | ||
63 | right: 16px; | ||
64 | width: 30%; | ||
65 | } | ||
66 | </style> | ||
67 | <link type="text/css" rel="stylesheet" href="/debugStyle.css" media="all" /> | 8 | <link type="text/css" rel="stylesheet" href="/debugStyle.css" media="all" /> |
68 | </head> | 9 | </head> |
69 | <body> | 10 | <body> |
diff --git a/example/var/www/html/password_help.html b/example/var/www/html/password_help.html new file mode 100644 index 0000000..db6c659 --- /dev/null +++ b/example/var/www/html/password_help.html | |||
@@ -0,0 +1,13 @@ | |||
1 | <html> | ||
2 | <title>Password help for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | <link type='text/css' rel='stylesheet' href='SledjChisl.css' media='all' /> | ||
7 | <meta http-equiv="refresh" content="120"> | ||
8 | </head> | ||
9 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> | ||
10 | <p>Include password help for your grid here.</p> | ||
11 | <p> </p> | ||
12 | </body> | ||
13 | </html> | ||
diff --git a/example/var/www/html/register.html b/example/var/www/html/register.html new file mode 100644 index 0000000..e37d2b0 --- /dev/null +++ b/example/var/www/html/register.html | |||
@@ -0,0 +1,17 @@ | |||
1 | <html> | ||
2 | <title>Account for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | <link type='text/css' rel='stylesheet' href='SledjChisl.css' media='all' /> | ||
7 | <meta http-equiv="refresh" content="120"> | ||
8 | </head> | ||
9 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> | ||
10 | <p>Include account registration help for your grid here.</p> | ||
11 | <p> </p> | ||
12 | <p>If you want to register an account on this grid, ask the person that runs it to do that for you.</p> | ||
13 | <p> </p> | ||
14 | <p>If you want to register an account on this grid, <a href="/sledjchisl.fcgi/account.html"> click here</a> (when it's written).</p> | ||
15 | <p> </p> | ||
16 | </body> | ||
17 | </html> | ||
diff --git a/example/www/stats.html b/example/var/www/html/stats.html index 7b51b06..a48ee01 100644 --- a/example/www/stats.html +++ b/example/var/www/html/stats.html | |||
@@ -3,20 +3,8 @@ | |||
3 | <head> | 3 | <head> |
4 | <meta charset="UTF-8"> | 4 | <meta charset="UTF-8"> |
5 | <link rel="shortcut icon" href="/SledjHamrIconSmall.png"> | 5 | <link rel="shortcut icon" href="/SledjHamrIconSmall.png"> |
6 | <link type='text/css' rel='stylesheet' href='/SledjChisl.css' media='all' /> | ||
6 | <meta http-equiv="refresh" content="120"> | 7 | <meta http-equiv="refresh" content="120"> |
7 | <style> | ||
8 | html, body {background-color: black; color: white; font-family: 'sans-serif'; margin: 0; padding: 0;} | ||
9 | a:link {color: aqua;} | ||
10 | a:visited {color: fuchsia;} | ||
11 | a:hover {color: blue;} | ||
12 | a:active {color: red;} | ||
13 | button {background-color: darkgreen; color: white; font-family: 'sans-serif';} | ||
14 | button:hover {color: blue;} | ||
15 | button:active {color: red;} | ||
16 | label {background-color:darkgreen; color: white; font-family: 'sans-serif'; font-size: 160%;} | ||
17 | input {background-color:darkblue; color: white; font-family: 'sans-serif'; font-size: 80%;} | ||
18 | textarea {background-color:darkblue; color: white; font-family: 'sans-serif'; font-size: 80%; vertical-align: top;} | ||
19 | </style> | ||
20 | </head> | 8 | </head> |
21 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> | 9 | <body bgcolor='black' text='white' link='aqua' vlink='fuchsia' alink='red'> |
22 | <font face='sans-serif'> | 10 | <font face='sans-serif'> |
diff --git a/example/www/SledjChisl.css b/example/www/SledjChisl.css deleted file mode 100644 index fb19f89..0000000 --- a/example/www/SledjChisl.css +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | html, body | ||
2 | { | ||
3 | margin: 0; | ||
4 | padding: 0; | ||
5 | color: white; | ||
6 | } | ||
7 | a {color: green;} | ||
8 | a:link {color: green;} | ||
9 | a:visited {color: purple;} | ||
10 | a:hover {color: red;} | ||
11 | a:active {color: blue;} | ||
12 | |||
13 | .container | ||
14 | { | ||
15 | position: relative; | ||
16 | text-align: left; | ||
17 | } | ||
18 | |||
19 | .top-left | ||
20 | { | ||
21 | position: absolute; | ||
22 | top: 8px; | ||
23 | left: 16px; | ||
24 | height: 30%; | ||
25 | width: 30%; | ||
26 | } | ||
27 | |||
28 | .top-right | ||
29 | { | ||
30 | position: absolute; | ||
31 | top: 8px; | ||
32 | right: 16px; | ||
33 | height: 30%; | ||
34 | width: 30%; | ||
35 | } | ||
36 | |||
37 | .centre | ||
38 | { | ||
39 | position: absolute; | ||
40 | top: 50%; | ||
41 | left: 50%; | ||
42 | height: 30%; | ||
43 | width: 30%; | ||
44 | transform: translate(-50%, -50%); | ||
45 | } | ||
46 | |||
47 | .bottom-left | ||
48 | { | ||
49 | position: absolute; | ||
50 | bottom: 8px; | ||
51 | left: 16px; | ||
52 | height: 30%; | ||
53 | width: 30%; | ||
54 | } | ||
55 | |||
56 | .bottom-right | ||
57 | { | ||
58 | position: absolute; | ||
59 | bottom: 8px; | ||
60 | right: 16px; | ||
61 | height: 30%; | ||
62 | width: 30%; | ||
63 | } | ||
diff --git a/example/www/about.html b/example/www/about.html deleted file mode 100644 index 3afc962..0000000 --- a/example/www/about.html +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <html> | ||
2 | <title>About this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | </head> | ||
7 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | ||
8 | This is a virtual world, usually called a grid, based on <a href="https://sledjhamr.org/cgit/opensim-SC/?h=SledjChisl">opensim-SC</a>. | ||
9 | <p> </p> | ||
10 | </body> | ||
11 | </html> | ||
diff --git a/example/www/help.html b/example/www/help.html deleted file mode 100644 index 9a75aa6..0000000 --- a/example/www/help.html +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <html> | ||
2 | <title>Help for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | </head> | ||
7 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | ||
8 | Include help for your grid here. | ||
9 | <p> </p> | ||
10 | </body> | ||
11 | </html> | ||
diff --git a/example/www/password_help.html b/example/www/password_help.html deleted file mode 100644 index aef6bd5..0000000 --- a/example/www/password_help.html +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | <html> | ||
2 | <title>Password help for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | </head> | ||
7 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | ||
8 | Include password help for your grid here. | ||
9 | <p> </p> | ||
10 | </body> | ||
11 | </html> | ||
diff --git a/example/www/register.html b/example/www/register.html deleted file mode 100644 index 46317e6..0000000 --- a/example/www/register.html +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | <html> | ||
2 | <title>Account for this grid</title> | ||
3 | <head> | ||
4 | <meta charset="UTF-8"> | ||
5 | <link rel="shortcut icon" href="SledjHamrIconSmall.png"> | ||
6 | </head> | ||
7 | <body bgcolor="black" text="white" alink="red" link="blue" vlink="purple"> | ||
8 | Include account registration help for your grid here. | ||
9 | <p> </p> | ||
10 | <p>If you want to register an account on this grid, ask the person that runs it to do that for you.</p> | ||
11 | <p> </p> | ||
12 | <p>If you want to register an account on this grid, <a href="account.html"> click here</a> (when it's written).</p> | ||
13 | <p> </p> | ||
14 | </body> | ||
15 | </html> | ||