Skip to content

Commit

Permalink
fix(service): set mnesia_base not mnesia_dir (derived)
Browse files Browse the repository at this point in the history
  • Loading branch information
noelmcloughlin committed Jul 28, 2021
1 parent e7f4065 commit 3b93fd2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@ rabbitmq:
environ:
locale_all: en_US.UTF-8
values: {}
# https://www.rabbitmq.com/configure.html#supported-environment-variables
# rabbitmq_mnesia_base: /var/lib/rabbitmq
# RABBITMQ_BASE: /var/lib/rabbitmq
# https://www.rabbitmq.com/relocate.html
# rabbitmq_mnesia_base: /var/lib/rabbitmq/mnesia
# RABBITMQ_USE_LONGNAME: true # not working in ci
# https://www.rabbitmq.com/configure.html#supported-environment-variables
# RABBITMQ_LOG_BASE: /var/log/rabbitmq
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/files/default/systemd.ini.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Environment="RABBITMQ_NODENAME={{ 'rabbit' if nodename is not defined else noden
Environment="RABBITMQ_NODE_PORT={{ '5672' if nodeport is not defined else nodeport }}"
Environment="RABBITMQ_SERVER_START_ARGS=-rabbitmq_management listener [{port,{{ nodeport + 10000 }}}]"
Environment="RABBITMQ_DIST_PORT={{ '25672' if distport is not defined else distport }}"
Environment="RABBITMQ_MNESIA_DIR={{ '/var/lib/rabbitmq' if mnesia_dir is not defined else mnesia_dir }}"
Environment="RABBITMQ_MNESIA_DIR={{ '/var/lib/rabbitmq/mnesia' if mnesia_dir is not defined else mnesia_dir }}"
Environment="RABBITMQ_CONFIG_FILE={{ '/etc/rabbitmq/rabbitmq.conf' if cfgfile is not defined else cfgfile }}"

# To override LimitNOFILE, create the following file:
Expand Down
2 changes: 1 addition & 1 deletion rabbitmq/service/running.sls
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ rabbitmq-service-running-managed-{{ name }}:
nodeport: {{ '' if 'nodeport' not in node else node.nodeport }}
distport: {{ '' if 'distport' not in node else node.distport }}
nodename: {{ name }}
mnesia_dir: {{ rabbitmq.dir.data }}/{{ name }}
mnesia_dir: {{ rabbitmq.dir.data }}/{{ name }}/mnesia
cfgfile: {{ rabbitmq.dir.config }}/{{ name }}/rabbitmq-server.conf
- watch_in:
- cmd: rabbitmq-service-running-daemon-reload
Expand Down

0 comments on commit 3b93fd2

Please sign in to comment.