Bläddra i källkod

update references to oragono.yaml to reflect new name of default.yaml

tags/v2.2.0-rc1
Shivaram Lingamneni 4 år sedan
förälder
incheckning
a6e2b5a3ae
8 ändrade filer med 13 tillägg och 13 borttagningar
  1. 1
    1
      .goreleaser.yml
  2. 3
    3
      Dockerfile
  3. 2
    2
      Makefile
  4. 1
    1
      README
  5. 2
    2
      README.md
  6. 1
    1
      conventional.yaml
  7. 1
    1
      distrib/docker/run.sh
  8. 2
    2
      docs/MANUAL.md

+ 1
- 1
.goreleaser.yml Visa fil

45
       - README
45
       - README
46
       - CHANGELOG.md
46
       - CHANGELOG.md
47
       - oragono.motd
47
       - oragono.motd
48
-      - oragono.yaml
48
+      - default.yaml
49
       - conventional.yaml
49
       - conventional.yaml
50
       - docs/*
50
       - docs/*
51
       - languages/*.yaml
51
       - languages/*.yaml

+ 3
- 3
Dockerfile Visa fil

10
 
10
 
11
 # modify default config file so that it doesn't die on IPv6
11
 # modify default config file so that it doesn't die on IPv6
12
 # and so it can be exposed via 6667 by default
12
 # and so it can be exposed via 6667 by default
13
-run sed -i 's/^\(\s*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/oragono.yaml
14
-run sed -i 's/^\s*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/oragono.yaml
13
+run sed -i 's/^\(\s*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/default.yaml
14
+run sed -i 's/^\s*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/default.yaml
15
 
15
 
16
 # make sure submodules are up-to-date
16
 # make sure submodules are up-to-date
17
 RUN git submodule update --init
17
 RUN git submodule update --init
40
 RUN mkdir -p /ircd-bin
40
 RUN mkdir -p /ircd-bin
41
 COPY --from=build-env /go/bin/oragono /ircd-bin
41
 COPY --from=build-env /go/bin/oragono /ircd-bin
42
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
42
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
43
-COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
43
+COPY --from=build-env /go/src/github.com/oragono/oragono/default.yaml /ircd-bin/default.yaml
44
 
44
 
45
 COPY distrib/docker/run.sh /ircd-bin/run.sh
45
 COPY distrib/docker/run.sh /ircd-bin/run.sh
46
 RUN chmod +x /ircd-bin/run.sh
46
 RUN chmod +x /ircd-bin/run.sh

+ 2
- 2
Makefile Visa fil

34
 	./.check-gofmt.sh
34
 	./.check-gofmt.sh
35
 
35
 
36
 smoke:
36
 smoke:
37
-	oragono mkcerts --conf ./oragono.yaml || true
38
-	oragono run --conf ./oragono.yaml --smoke
37
+	oragono mkcerts --conf ./default.yaml || true
38
+	oragono run --conf ./default.yaml --smoke

+ 1
- 1
README Visa fil

23
 
23
 
24
 Copy the example config file to ircd.yaml with a command like:
24
 Copy the example config file to ircd.yaml with a command like:
25
 
25
 
26
-    $ cp oragono.yaml ircd.yaml
26
+    $ cp default.yaml ircd.yaml
27
 
27
 
28
 Modify the config file as you like. In particular, the `connection-throttling` and
28
 Modify the config file as you like. In particular, the `connection-throttling` and
29
 `connection-limits` sections are working looking over and tuning for your network's needs.
29
 `connection-limits` sections are working looking over and tuning for your network's needs.

+ 2
- 2
README.md Visa fil

49
 Extract it into a folder, then run the following commands:
49
 Extract it into a folder, then run the following commands:
50
 
50
 
51
 ```sh
51
 ```sh
52
-cp oragono.yaml ircd.yaml
52
+cp default.yaml ircd.yaml
53
 vim ircd.yaml  # modify the config file to your liking
53
 vim ircd.yaml  # modify the config file to your liking
54
 oragono mkcerts
54
 oragono mkcerts
55
 ```
55
 ```
84
 
84
 
85
 ## Configuration
85
 ## Configuration
86
 
86
 
87
-The default config file [`oragono.yaml`](oragono.yaml) helps walk you through what each option means and changes. The configuration's intended to be sparse, so if there are options missing it's either because that feature isn't written/configurable yet or because we don't think it should be configurable.
87
+The default config file [`default.yaml`](default.yaml) helps walk you through what each option means and changes.
88
 
88
 
89
 You can use the `--conf` parameter when launching Oragono to control where it looks for the config file. For instance: `oragono run --conf /path/to/ircd.yaml`. The configuration file also stores where the log, database, certificate, and other files are opened. Normally, all these files use relative paths, but you can change them to be absolute (such as `/var/log/ircd.log`) when running Oragono as a service.
89
 You can use the `--conf` parameter when launching Oragono to control where it looks for the config file. For instance: `oragono run --conf /path/to/ircd.yaml`. The configuration file also stores where the log, database, certificate, and other files are opened. Normally, all these files use relative paths, but you can change them to be absolute (such as `/var/log/ircd.log`) when running Oragono as a service.
90
 
90
 

+ 1
- 1
conventional.yaml Visa fil

18
         # This version of the config provides a public plaintext listener on
18
         # This version of the config provides a public plaintext listener on
19
         # port 6667 for testing and compatibility with legacy applications.
19
         # port 6667 for testing and compatibility with legacy applications.
20
         # We recommend disabling this listener in a production setting
20
         # We recommend disabling this listener in a production setting
21
-        # and replacing it with loopback-only listeners (see oragono.yaml):
21
+        # and replacing it with loopback-only listeners (see default.yaml):
22
         ":6667":
22
         ":6667":
23
 
23
 
24
         # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
24
         # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:

+ 1
- 1
distrib/docker/run.sh Visa fil

5
 
5
 
6
 # make config file
6
 # make config file
7
 if [ ! -f "/ircd/ircd.yaml" ]; then
7
 if [ ! -f "/ircd/ircd.yaml" ]; then
8
-    awk '{gsub(/path: languages/,"path: /ircd-bin/languages")}1' /ircd-bin/oragono.yaml > /tmp/ircd.yaml
8
+    awk '{gsub(/path: languages/,"path: /ircd-bin/languages")}1' /ircd-bin/default.yaml > /tmp/ircd.yaml
9
 
9
 
10
     # change default oper passwd
10
     # change default oper passwd
11
     OPERPASS=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c20)
11
     OPERPASS=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c20)

+ 2
- 2
docs/MANUAL.md Visa fil

97
 
97
 
98
 1. Make sure you have the [latest release](https://github.com/oragono/oragono/releases/latest) downloaded.
98
 1. Make sure you have the [latest release](https://github.com/oragono/oragono/releases/latest) downloaded.
99
 1. Extract the zip file to a folder.
99
 1. Extract the zip file to a folder.
100
-1. Copy and rename `oragono.yaml` to `ircd.yaml`.
100
+1. Copy and rename `default.yaml` to `ircd.yaml`.
101
 1. Open up `ircd.yaml` using any text editor, and then save it once you're happy.
101
 1. Open up `ircd.yaml` using any text editor, and then save it once you're happy.
102
 1. Open up a `cmd.exe` window, then `cd` to where you have Oragono extracted.
102
 1. Open up a `cmd.exe` window, then `cd` to where you have Oragono extracted.
103
 1. Run `oragono.exe mkcerts` if you want to generate new self-signed SSL/TLS certificates (note that you can't enable STS if you use self-signed certs).
103
 1. Run `oragono.exe mkcerts` if you want to generate new self-signed SSL/TLS certificates (note that you can't enable STS if you use self-signed certs).
111
 
111
 
112
 1. Make sure you have the [latest release](https://github.com/oragono/oragono/releases/latest) for your OS/distro downloaded.
112
 1. Make sure you have the [latest release](https://github.com/oragono/oragono/releases/latest) for your OS/distro downloaded.
113
 1. Extract the tar.gz file to a folder.
113
 1. Extract the tar.gz file to a folder.
114
-1. Copy and rename `oragono.yaml` to `ircd.yaml`.
114
+1. Copy and rename `default.yaml` to `ircd.yaml`.
115
 1. Open up `ircd.yaml` using any text editor, and then save it once you're happy.
115
 1. Open up `ircd.yaml` using any text editor, and then save it once you're happy.
116
 1. Open up a Terminal window, then `cd` to where you have Oragono extracted.
116
 1. Open up a Terminal window, then `cd` to where you have Oragono extracted.
117
 1. Run `./oragono mkcerts` if you want to generate new self-signed SSL/TLS certificates (note that you can't enable STS if you use self-signed certs).
117
 1. Run `./oragono mkcerts` if you want to generate new self-signed SSL/TLS certificates (note that you can't enable STS if you use self-signed certs).

Laddar…
Avbryt
Spara