Skip to content

Commit 10b4a2c

Browse files
committed
Updated documentation
1 parent a225c05 commit 10b4a2c

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

.vscode/settings.json

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"cSpell.words": [
33
"poenskelisten",
4+
"Pønskeliste",
45
"Pønskelisten",
6+
"XAMPP",
57
"xhttp"
68
]
79
}

README.md

+14-15
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Create a table for Pønskelisten (Docker image does this automatically), and rem
6464

6565
### 2. Start Pønskelisten
6666

67-
If you want to edit the configuration file manually, start up Pønskelisten and then let it complain a bunch. You can edit the configuration file manually afterward. If not, look further down at the `Startup flags` for starting Pønsklisten with configuration options.
67+
If you want to edit the configuration file manually, start up Pønskelisten and then let it complain a bunch. You can edit the configuration file manually afterward. If not, look further down at the `Startup flags` for starting Pønskelisten with configuration options.
6868

6969
Either compile your chosen branch/tag with Go installed and run it:
7070

@@ -86,29 +86,28 @@ If you want to start up Pønskelisten with some startup flags for a smoother exp
8686

8787
#### Startup flags
8888

89-
You can use startup flags to generate values to populate the configuration file with. They are only used if the configuration file doesn't have a pre-configured value to prioritize. The moment the configuration file has values, these flags are useless. Sort of a one-time thing.
89+
You can use startup flags to generate values to populate the configuration file with.
9090

91-
The exceptions are `generateinvite`, which will generate a new, random invitation code at each usage, and `disablesmtp` which will always disable the SMTP function.
91+
The exception is `generateinvite`, which will generate a new, random invitation code at each usage.
9292

9393
<br>
9494
<br>
9595

96-
| Flag | Type | Explaination |
96+
| Flag | Type | Explanation |
9797
|:-:|:-:|--:|
9898
| port | integer | Which port Pønskelisten starts on. |
9999
| timezone | string | The timezone Pønskelisten uses. Given in the TZ database name format. List can be found [here](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). |
100100
| generateinvite | string (true/false) | If Pønskelisten should generate an invitation code on startup. |
101101
| dbip | string | The connection address Pønskelisten uses to reach the database. |
102102
| dbport | integer | The port Pønskelisten can reach the database at. |
103103
| dbname | string | The name of the table within the database. |
104-
| dbusername | string | The username used to autnenicate with the database. |
105-
| dbpassword | string | The password used to autnenicate with the database. |
106-
| disablesmtp | string (true/false) | Disables SMTP, meaning user verificaton is disabled. SMTP is enabled by default. |
104+
| dbusername | string | The username used to authenticate with the database. |
105+
| dbpassword | string | The password used to authenticate with the database. |
106+
| disablesmtp | string (true/false) | Disables SMTP, meaning user verification is disabled. SMTP is enabled by default. |
107107
| smtphost | string | The SMTP server host used. |
108108
| smtpport | integer | The SMTP server host port used. |
109109
| smtpusername | string | The username used to authenticate towards the SMTP server used. |
110110
| smtppassword | string | The username used to authenticate towards the SMTP server used. |
111-
| upgradetov2 | string (true/false) | Converts `db.sql` in the `/files` folder to the v2.00 format. |
112111

113112
<br>
114113
<br>
@@ -137,7 +136,7 @@ Edit the configuration file so it can reach the MySQL database, and possibly an
137136

138137
Restart Pønskelisten for the changes to take effect.
139138

140-
You should not be able to access Pønskelisten. By default, you can find the front end at `localhost:8080`.
139+
You should not be able to access Pønskelisten. By default, you can find the front end at `https://localhost:8080`.
141140

142141
<br>
143142
<br>
@@ -158,7 +157,7 @@ I recommend installing PHPMyAdmin (a database interface) either as a [Docker ima
158157

159158
The first user who signs up is automatically an admin. You need an invitation code for every user who wants to sign up. This can be generated on the admin page.
160159

161-
Be prepared to access the DB every time a user manages to screw up their e-mail while signing up or someone needs an invitation code.
160+
Be prepared to access the DB every time a user manages to screw up their e-mail.
162161

163162
<br>
164163
<br>
@@ -167,9 +166,9 @@ Be prepared to access the DB every time a user manages to screw up their e-mail
167166

168167
### Environment variables
169168

170-
All the startup flags in the table given previously can be used as environment variables. Do keep in mind that the flags, and in turn the environment variables, are only used if the value is not already defined in the configuration file.
169+
All the startup flags in the table given previously can be used as environment variables.
171170

172-
The only exceptions are the `generateinvite` and the `disablesmtp`. Consider removing the `generateinvite` environment variable from your Docker compose file so you don't generate a new code at every restart.
171+
Consider removing the `generateinvite` environment variable from your Docker compose file so you don't generate a new code at every restart.
173172

174173
<br>
175174
<br>
@@ -220,17 +219,17 @@ services:
220219
# Where our Pønskeliste files are
221220
volumes:
222221
- ./data/:/app/files/
222+
- ./images/:/app/images/
223223
224224
ports:
225225
- '8080:8080'
226-
environment:
227226
227+
environment:
228228
# Generate an unused invite code on startup
229229
# Remove this value to avoid continuous code-generation
230230
generateinvite: true
231231
232-
# The container will only respect these ENV if they are empty in the config.json
233-
# Useful for first setup
232+
# These will overwrite the config.json
234233
port: 8080
235234
timezone: Europe/Oslo
236235
dbip: db

0 commit comments

Comments
 (0)