diff options
| -rw-r--r-- | ergo/defaults/main.yaml | 9 | ||||
| -rw-r--r-- | ergo/files/ergo.service (renamed from oragono/files/oragono.service) | 14 | ||||
| -rw-r--r-- | ergo/handlers/main.yaml | 9 | ||||
| -rw-r--r-- | ergo/tasks/main.yaml | 65 | ||||
| -rw-r--r-- | ergo/templates/config.yaml.j2 (renamed from oragono/templates/oragono.yaml.j2) | 56 | ||||
| -rw-r--r-- | ergo/templates/nginx.conf.j2 (renamed from oragono/templates/nginx.conf.j2) | 2 | ||||
| -rw-r--r-- | minecraft/server/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | miniflux/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | oragono/defaults/main.yaml | 9 | ||||
| -rw-r--r-- | oragono/handlers/main.yaml | 9 | ||||
| -rw-r--r-- | oragono/tasks/main.yaml | 65 | ||||
| -rw-r--r-- | pleroma/otp/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | writefreely/server/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | writefreely/server/tasks/main.yaml | 4 |
14 files changed, 126 insertions, 126 deletions
diff --git a/ergo/defaults/main.yaml b/ergo/defaults/main.yaml new file mode 100644 index 0000000..fa1b16f --- /dev/null +++ b/ergo/defaults/main.yaml @@ -0,0 +1,9 @@ +--- + +ergo_user: "ergo" +ergo_version: "2.7.0" +ergo_arch: "arm64" +ergo_tar_name: "ergo-{{ergo_version}}-linux-{{ergo_arch}}" +ergo_tar: "{{ergo_tar_name}}.tar.gz" +ergo_url: "https://github.com/ergochat/ergo/releases/download/v{{ergo_version}}/{{ergo_tar}}" +ergo_force_nick_equals_account: false diff --git a/oragono/files/oragono.service b/ergo/files/ergo.service index f751ec0..54ff847 100644 --- a/oragono/files/oragono.service +++ b/ergo/files/ergo.service @@ -1,17 +1,17 @@ [Unit] -Description=oragono -After=network.target +Description=ergo +#After=network.target # If you are using MySQL for history storage, comment out the above line # and uncomment these two instead (you must independently install and configure # MySQL for your system): -# Wants=mysql.service -# After=network.target mysql.service +Wants=mysql.service +After=network.target mysql.service [Service] Type=simple -User=oragono -WorkingDirectory=/var/oragono -ExecStart=/usr/local/bin/oragono run --conf /etc/oragono/oragono.yaml +User=ergo +WorkingDirectory=/var/ergo +ExecStart=/usr/local/bin/ergo run --conf /etc/ergo/config.yaml ExecReload=/bin/kill -HUP $MAINPID Restart=on-failure LimitNOFILE=1048576 diff --git a/ergo/handlers/main.yaml b/ergo/handlers/main.yaml new file mode 100644 index 0000000..31b1d1e --- /dev/null +++ b/ergo/handlers/main.yaml @@ -0,0 +1,9 @@ +--- + +- name: restart ergo + become: yes + systemd: name="ergo.service" state="restarted" daemon_reload="yes" + +- name: reload ergo + become: yes + systemd: name="ergo.service" state="reloaded" diff --git a/ergo/tasks/main.yaml b/ergo/tasks/main.yaml new file mode 100644 index 0000000..deaa2c7 --- /dev/null +++ b/ergo/tasks/main.yaml @@ -0,0 +1,65 @@ +--- + +- name: add ergo user + become: yes + user: name="ergo" + +- name: download ergo + become: yes + unarchive: + remote_src: yes + src: "{{ergo_url}}" + dest: "/tmp" + creates: "/tmp/{{ergo_tar_name}}/" + +- name: install ergo + become: yes + copy: + src: "/tmp/{{ergo_tar_name}}/ergo" + dest: "/usr/local/bin/" + remote_src: yes + owner: "root" + group: "root" + mode: "0755" + notify: restart ergo + +- name: create ergo dirs + become: yes + file: + path: "{{item}}/ergo" + owner: "ergo" + group: "ergo" + mode: "0755" + state: "directory" + loop: + - "/etc" + - "/var" + +- name: configure ergo + become: yes + template: + src: "config.yaml.j2" + dest: "/etc/ergo/config.yaml" + owner: "ergo" + group: "ergo" + mode: "0644" + notify: reload ergo + +- name: copy motd file + become: yes + copy: + src: "{{ergo_motd}}" + dest: "/etc/ergo/motd" + notify: reload ergo + +- name: install ergo service + become: yes + copy: + src: "ergo.service" + dest: "/lib/systemd/system/ergo.service" + mode: "0644" + notify: restart ergo + +- name: ensure ergo is started + become: yes + systemd: service="ergo.service" enabled="yes" state="started" daemon_reload="yes" diff --git a/oragono/templates/oragono.yaml.j2 b/ergo/templates/config.yaml.j2 index c45cb00..e0dac7a 100644 --- a/oragono/templates/oragono.yaml.j2 +++ b/ergo/templates/config.yaml.j2 @@ -1,9 +1,9 @@ -# This is the default config file for Oragono. +# This is the default config file for Ergo. # It contains recommended defaults for all settings, including some behaviors # that differ from conventional ircds. See conventional.yaml for a config # with more "mainstream" behavior. # -# If you are setting up a new oragono server, you should copy this file +# If you are setting up a new ergo server, you should copy this file # to a new one named 'ircd.yaml', then read the whole file to see which # settings you want to customize. If you don't understand a setting, or # aren't sure what behavior you want, most of the defaults are fine @@ -25,12 +25,12 @@ # network configuration network: # name of the network - name: {{oragono_network_name}} + name: {{ergo_network_name}} # server configuration server: # server name - name: {{oragono_server_name}} + name: {{ergo_server_name}} # addresses to listen on listeners: @@ -58,12 +58,12 @@ server: # proxy: false # Example of a Unix domain socket for proxying: - "/var/oragono/oragono.socket": + "/var/ergo/socket": # Example of a Tor listener: any connection that comes in on this listener will # be considered a Tor connection. It is strongly recommended that this listener # *not* be on a public interface --- it should be on 127.0.0.0/8 or unix domain: - # "/hidden_service_sockets/oragono_tor_sock": + # "/hidden_service_sockets/ergo_tor_sock": # tor: true # Example of a WebSocket listener: @@ -116,13 +116,13 @@ server: websockets: # Restrict the origin of WebSocket connections by matching the "Origin" HTTP - # header. This settings makes oragono reject every WebSocket connection, + # header. This settings makes ergo reject every WebSocket connection, # except when it originates from one of the hosts in this list. Use this to - # prevent malicious websites from making their visitors connect to oragono + # prevent malicious websites from making their visitors connect to ergo # without their knowledge. An empty list means that there are no restrictions. allowed-origins: - # - "https://oragono.io" - # - "https://*.oragono.io" + # - "https://ergo.io" + # - "https://*.ergo.io" # casemapping controls what kinds of strings are permitted as identifiers (nicknames, # channel names, account names, etc.), and how they are normalized for case. @@ -149,12 +149,12 @@ server: check-ident: false # password to login to the server - # generated using "oragono genpasswd" + # generated using "ergo genpasswd" #password: "" # motd filename # if you change the motd, you should move it to ircd.motd - motd: "/etc/oragono/oragono.motd" + motd: "/etc/ergo/motd" # motd formatting codes # if this is true, the motd is escaped using formatting codes like $c, $b, and $i @@ -177,7 +177,7 @@ server: # (comment this out to use passwords only) fingerprint: "abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789" - # password the gateway uses to connect, made with oragono genpasswd + # password the gateway uses to connect, made with ergo genpasswd password: "$2a$04$abcdef0123456789abcdef0123456789abcdef0123456789abcde" # addresses/CIDRs that can use this webirc command @@ -199,7 +199,7 @@ server: compatibility: # many clients require that the final parameter of certain messages be an # RFC1459 trailing parameter, i.e., prefixed with :, whether or not this is - # actually required. this forces Oragono to send those parameters + # actually required. this forces Ergo to send those parameters # as trailings. this is recommended unless you're testing clients for conformance; # defaults to true when unset for that reason. force-trailing: true @@ -250,7 +250,7 @@ server: # IP cloaking hides users' IP addresses from other users and from channel admins # (but not from server admins), while still allowing channel admins to ban # offending IP addresses or networks. In place of hostnames derived from reverse - # DNS, users see fake domain names like pwbs2ui4377257x8.oragono. These names are + # DNS, users see fake domain names like pwbs2ui4377257x8.ergo. These names are # generated deterministically from the underlying IP address, but if the underlying # IP is not already known, it is infeasible to recover it from the cloaked name. ip-cloaking: @@ -259,7 +259,7 @@ server: # fake TLD at the end of the hostname, e.g., pwbs2ui4377257x8.irc # you may want to use your network name here - netname: "usr.{{oragono_network_name}}" + netname: "usr.{{ergo_network_name}}" # the cloaked hostname is derived only from the CIDR (most significant bits # of the IP address), up to a configurable number of bits. this is the @@ -285,10 +285,10 @@ server: secure-nets: # - "10.0.0.0/8" - # oragono will write files to disk under certain circumstances, e.g., + # ergo will write files to disk under certain circumstances, e.g., # CPU profiling or data export. by default, these files will be written # to the working directory. set this to customize: - output-path: "/var/oragono" + output-path: "/var/ergo" # account options accounts: @@ -417,9 +417,9 @@ accounts: # account name as their nickname. when combined with strict nickname # enforcement, this lets users treat nicknames and account names # as equivalent for the purpose of ban/invite/exception lists. - force-nick-equals-account: {{oragono_force_nick_equals_account}} + force-nick-equals-account: {{ergo_force_nick_equals_account}} - # multiclient controls whether oragono allows multiple connections to + # multiclient controls whether ergo allows multiple connections to # attach to the same client/nickname identity; this is part of the # functionality traditionally provided by a bouncer like ZNC multiclient: @@ -474,7 +474,7 @@ accounts: # vhosts that users can take without approval, using `/HS TAKE` offer-list: - #- "oragono.test" + #- "ergo.test" # modes that are set by default when a user connects # if unset, no user modes will be set by default @@ -606,7 +606,7 @@ opers: whois-line: "server admin" # custom hostname - vhost: "opr.{{oragono_network_name}}" + vhost: "opr.{{ergo_network_name}}" # modes are the modes to auto-set upon opering-up modes: +is acjknoqtuxv @@ -614,8 +614,8 @@ opers: # operators can be authenticated either by password (with the /OPER command), # or by certificate fingerprint, or both. if a password hash is set, then a # password is required to oper up (e.g., /OPER dan mypassword). to generate - # the hash, use `oragono genpasswd`. - password: "{{oragono_oper_pass_hash}}" + # the hash, use `ergo genpasswd`. + password: "{{ergo_oper_pass_hash}}" # if a SHA-256 certificate fingerprint is configured here, then it will be # required to /OPER. if you comment out the password hash above, then you can @@ -668,7 +668,7 @@ logging: # debug options debug: - # when enabled, oragono will attempt to recover from certain kinds of + # when enabled, ergo will attempt to recover from certain kinds of # client-triggered runtime errors that would normally crash the server. # this makes the server more resilient to DoS, but could result in incorrect # behavior. deployments that would prefer to "start from scratch", e.g., by @@ -685,7 +685,7 @@ debug: # datastore configuration datastore: # path to the datastore - path: "/var/oragono/oragono.db" + path: "/var/ergo/ergo.db" # if the database schema requires an upgrade, `autoupgrade` will attempt to # perform it automatically on startup. the database will be backed @@ -699,9 +699,9 @@ datastore: port: 3306 # if socket-path is set, it will be used instead of host:port #socket-path: "/var/run/mysqld/mysqld.sock" - user: "oragono" + user: "ergo" password: "hunter2" - history-database: "oragono_history" + history-database: "ergo_history" timeout: 3s # languages config diff --git a/oragono/templates/nginx.conf.j2 b/ergo/templates/nginx.conf.j2 index 2cedd56..1b1a83b 100644 --- a/oragono/templates/nginx.conf.j2 +++ b/ergo/templates/nginx.conf.j2 @@ -1,6 +1,6 @@ server { listen 6697 ssl; - proxy_pass unix:/var/oragono/oragono.socket; + proxy_pass unix:/var/ergo/socket; proxy_protocol on; ssl_certificate {{nginx_ssl_cert}}; diff --git a/minecraft/server/defaults/main.yaml b/minecraft/server/defaults/main.yaml index f7143c5..e87787a 100644 --- a/minecraft/server/defaults/main.yaml +++ b/minecraft/server/defaults/main.yaml @@ -12,7 +12,7 @@ minecraft_world_name: "world" # https://papermc.io minecraft_paper_version: "1.17.1" -minecraft_paper_build: "98" +minecraft_paper_build: "127" minecreat_plugins_enabled: - "dynmap" @@ -22,4 +22,4 @@ minecreat_plugins_enabled: minecraft_dynmap_version: "3.2-beta-2" # https://geysermc.org -minecraft_geyser_vesrion: "752" +minecraft_geyser_vesrion: "778" diff --git a/miniflux/defaults/main.yaml b/miniflux/defaults/main.yaml index 97d4acd..eb467bf 100644 --- a/miniflux/defaults/main.yaml +++ b/miniflux/defaults/main.yaml @@ -3,5 +3,5 @@ miniflux_port: "8555" miniflux_admin_pass: "admin" miniflux_arch: "arm64" -miniflux_version: "2.0.29" +miniflux_version: "2.0.31" miniflux_url: "https://github.com/miniflux/miniflux/releases/download/{{miniflux_version}}/miniflux-linux-{{miniflux_arch}}" diff --git a/oragono/defaults/main.yaml b/oragono/defaults/main.yaml deleted file mode 100644 index e4d785d..0000000 --- a/oragono/defaults/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -oragono_user: "oragono" -oragono_version: "2.6.1" -oragono_arch: "arm64" -oragono_tar_name: "oragono-{{oragono_version}}-linux-{{oragono_arch}}" -oragono_tar: "{{oragono_tar_name}}.tar.gz" -oragono_url: "https://github.com/ergochat/ergo/releases/download/v{{oragono_version}}/{{oragono_tar}}" -oragono_force_nick_equals_account: false diff --git a/oragono/handlers/main.yaml b/oragono/handlers/main.yaml deleted file mode 100644 index a45e622..0000000 --- a/oragono/handlers/main.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -- name: restart oragono - become: yes - systemd: name="oragono.service" state="restarted" daemon_reload="yes" - -- name: reload oragono - become: yes - systemd: name="oragono.service" state="reloaded" diff --git a/oragono/tasks/main.yaml b/oragono/tasks/main.yaml deleted file mode 100644 index f2c982d..0000000 --- a/oragono/tasks/main.yaml +++ /dev/null @@ -1,65 +0,0 @@ ---- - -- name: add oragono user - become: yes - user: name="oragono" - -- name: download oragono - become: yes - unarchive: - remote_src: yes - src: "{{oragono_url}}" - dest: "/tmp" - creates: "/tmp/{{oragono_tar_name}}/" - -- name: install oragono - become: yes - copy: - src: "/tmp/{{oragono_tar_name}}/oragono" - dest: "/usr/local/bin/" - remote_src: yes - owner: "root" - group: "root" - mode: "0755" - notify: restart oragono - -- name: create oragono dirs - become: yes - file: - path: "{{item}}/oragono" - owner: "oragono" - group: "oragono" - mode: "0755" - state: "directory" - loop: - - "/etc" - - "/var" - -- name: configure oragono - become: yes - template: - src: "oragono.yaml.j2" - dest: "/etc/oragono/oragono.yaml" - owner: "oragono" - group: "oragono" - mode: "0644" - notify: reload oragono - -- name: copy motd file - become: yes - copy: - src: "{{oragono_motd}}" - dest: "/etc/oragono/oragono.motd" - notify: reload oragono - -- name: install oragono service - become: yes - copy: - src: "oragono.service" - dest: "/lib/systemd/system/oragono.service" - mode: "0644" - notify: restart oragono - -- name: ensure oragono is started - become: yes - systemd: service="oragono.service" enabled="yes" state="started" daemon_reload="yes" diff --git a/pleroma/otp/defaults/main.yaml b/pleroma/otp/defaults/main.yaml index e4eb040..15b5315 100644 --- a/pleroma/otp/defaults/main.yaml +++ b/pleroma/otp/defaults/main.yaml @@ -25,5 +25,5 @@ pleroma_data_dir: "/var/lib/pleroma/instance_data" pleroma_download_url: "https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job={{pleroma_arch}}" pleroma_soapbox: false -pleroma_soapbox_version: "v1.2.3" +pleroma_soapbox_version: "v1.3.0" pleroma_soapbox_download_url: "https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/{{pleroma_soapbox_version}}/download?job=build-production" diff --git a/writefreely/server/defaults/main.yaml b/writefreely/server/defaults/main.yaml index 8a43647..7cc4c24 100644 --- a/writefreely/server/defaults/main.yaml +++ b/writefreely/server/defaults/main.yaml @@ -2,7 +2,7 @@ writefreely_user: "writefreely" writefreely_arch: "arm64" -writefreely_version: "0.12.0" +writefreely_version: "0.13.1" writefreely_tar: "https://github.com/writeas/writefreely/releases/download/v{{writefreely_version}}/writefreely_{{writefreely_version}}_linux_{{writefreely_arch}}.tar.gz" writefreely_dir: "/var/writefreely" diff --git a/writefreely/server/tasks/main.yaml b/writefreely/server/tasks/main.yaml index 86e0295..2ea11b5 100644 --- a/writefreely/server/tasks/main.yaml +++ b/writefreely/server/tasks/main.yaml @@ -66,10 +66,10 @@ - name: generate keys become: yes become_user: "{{writefreely_user}}" - command: "writefreely keys gen" + command: "writefreely keys generate" args: chdir: "{{writefreely_dir}}/{{writefreely_instance}}/" - when: not keys_file.stat.exists + # when: not keys_file.stat.exists - name: check if db exists stat: |