Projects
home:rottame:yggdra_agents
mailserver_agent
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 9
View file
rubygem-mailserver_agent.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 16 08:25:25 UTC 2026 - Angelo Grossini <rottame@intercom.it> + +- update to 1.0.3 +- sysusers + +------------------------------------------------------------------- Tue Dec 2 13:32:21 UTC 2025 - Angelo Grossini <rottame@intercom.it> - update dependencies
View file
rubygem-mailserver_agent.spec
Changed
@@ -1,4 +1,4 @@ -%define package_version 1.0.2 +%define package_version 1.0.3 %define mod_name mailserver_agent %define mod_full_name %{mod_name}-%{version} @@ -17,11 +17,13 @@ Source5: tomte.yml Source6: mailserver_agent.yml Source7: gem2rpm.yml +Source8: mailserver_agent.sysuser BuildRequires: ruby-macros >= 5 BuildRequires: systemd-rpm-macros BuildRequires: %{ruby >= 1.9} BuildRequires: %{rubygem gem2rpm} BuildRequires: sudo +BuildRequires: sysuser-tools Requires: amavisd-new Requires: sudo BuildRoot: %{_tmppath}/%{mod_full_name}-build @@ -33,6 +35,7 @@ Summary: Mailserver DKIM Agent Group: System/Daemons Requires: rubygem(%{mod_name}) = %{version} +%sysusers_requires %description -n mailserver_agent Mailserver DKIM agent provisioning agent @@ -40,6 +43,7 @@ %prep %build +%sysusers_generate_pre %{SOURCE8} mailserver_agent mailserver_agent.conf %install %gem_install -f --symlink-binaries --no-ri --no-rdoc @@ -50,6 +54,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/mailserver_agent.conf install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/mailserver_agent/tomte.yml install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/mailserver_agent/mailserver_agent.yml +install -D -m 0644 %{SOURCE8} %{buildroot}%{_sysusersdir}/mailserver_agent.conf install -d %{buildroot}%{_sbindir} ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmailserver_agent @@ -65,17 +70,17 @@ %attr(0440, root, root) %config %{_sysconfdir}/sudoers.d/mailserver_agent %attr(0440, root, root) %config(noreplace) %{_sysconfdir}/logrotate.d/mailserver_agent -%attr(0700, dkim_agent, dkim_agent) %dir %{_localstatedir}/lib/mailserver_agent +%attr(0700, mailserver_agent, vscan) %dir %{_localstatedir}/lib/mailserver_agent %{_unitdir}/mailserver_agent.service %{_tmpfilesdir}/mailserver_agent.conf %{_sbindir}/rcmailserver_agent +%{_sysusersdir}/mailserver_agent.conf -%pre -n mailserver_agent -%{_bindir}/getent group dkim_agent >/dev/null || %{_sbindir}/groupadd -r dkim_agent -%{_bindir}/getent passwd dkim_agent >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/mailserver_agent -s /bin/false -c "intercom mail policyd" -g dkim_agent dkim_agent + +%pre -n mailserver_agent -f mailserver_agent.pre %service_add_pre mailserver_agent.service exit 0
View file
mailserver_agent-1.0.2.gem/data/Dockerfile
Deleted
@@ -1,45 +0,0 @@ -FROM opensuse/leap:15.3 -RUN zypper -n ar http://repos.obs.intercom.it/home:/rottame:/rubygems/openSUSE_Leap_15.3/ vhosts-ng -RUN zypper -n --gpg-auto-import-keys ref -RUN zypper -n in ruby2.5-rubygem-activesupport-5.2 \ - ruby2.5-rubygem-amq-protocol \ - ruby2.5-rubygem-amqp \ - ruby2.5-rubygem-awesome_print \ - ruby2.5-rubygem-bson \ - ruby2.5-rubygem-bson_ext \ - ruby2.5-rubygem-bundler \ - ruby2.5-rubygem-case \ - ruby2.5-rubygem-coderay \ - ruby2.5-rubygem-concurrent-ruby \ - ruby2.5-rubygem-diff-lcs \ - ruby2.5-rubygem-eventmachine \ - ruby2.5-rubygem-i18n \ - ruby2.5-rubygem-json \ - ruby2.5-rubygem-kyotocabinet \ - ruby2.5-rubygem-method_source \ - ruby2.5-rubygem-mime-types \ - ruby2.5-rubygem-mime-types-data \ - ruby2.5-rubygem-minitest \ - ruby2.5-rubygem-pry \ - ruby2.5-rubygem-publisher \ - ruby2.5-rubygem-rake-12_0 \ - ruby2.5-rubygem-rspec \ - ruby2.5-rubygem-rspec-core \ - ruby2.5-rubygem-rspec-expectations \ - ruby2.5-rubygem-rspec-mocks \ - ruby2.5-rubygem-rspec-support \ - ruby2.5-rubygem-thor \ - ruby2.5-rubygem-thread_safe \ - ruby2.5-rubygem-tomte-core \ - ruby2.5-rubygem-tomte-protocol \ - ruby2.5-rubygem-tzinfo \ - ruby2.5-rubygem-uuidtools \ - ruby2.5-rubygem-wml-compat \ - ruby2.5-rubygem-ygg_provisioner \ - ruby2.5-rubygem-zeitwerk \ - ruby2.5-rubygem-activeresource-hel \ - ruby2.5-rubygem-sentry-raven \ - vim iputils bind-utils -RUN mkdir /var/lib/hel-agent/ -RUN mkdir /mailserver_agent -WORKDIR /mailserver_agent \ No newline at end of file
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.logrotate
Deleted
@@ -1,15 +0,0 @@ -/var/log/tomte/mailserver_agent/*log { - compress - dateext - maxage 3650 - rotate 3650 - size=+2048k - notifempty - missingok - copytruncate - su tomte tomte - create 0644 tomte tomte - postrotate - systemctl restart mailserver_agent.service - endscript -}
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.service
Deleted
@@ -1,15 +0,0 @@ -Unit -Description=Starts and stops hel mailserver agent - -Service -Type=simple -User=tomte -Group=tomte -PIDFile=/run/mailserver_agent/mailserver_agent.pid -ExecStart=/usr/sbin/mailserver_agent --pidfile /run/mailserver_agent/mailserver_agent.pid -e production --no-daemonize -WorkingDirectory=/var/lib/tomte -Restart=always - -Install -WantedBy=multi-user.target -
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.spec.in
Deleted
@@ -1,98 +0,0 @@ -%define mod_name mailserver_agent -%define mod_full_name %{mod_name}-%{version} - -Name: rubygem-mailserver_agent -Version: VERSION -Release: 0 -Summary: Mailserver DKIM Agent -License: Apache-2.0 -Group: Development/Languages/Ruby -URL: https://intercom.it -Source: %{mod_full_name}.gem -Source1: mailserver_agent.service -Source2: mailserver_agent.tempfiles -Source3: mailserver_agent.yml -Source4: tomte.yml -Source5: mailserver_agent.logrotate -Source6: mailserver_agent.sudoers -BuildRequires: ruby-macros >= 5 -BuildRequires: systemd-rpm-macros -BuildRequires: sudo -Requires: amavisd-new -BuildRequires: %{rubygem gem2rpm} -BuildRequires: ruby-macros >= 5 - -%description -Mailserver DKIM agent provisioning agent - -%package -n mailserver_agent -Summary: Mailserver DKIM Agent -Group: System/Daemons -Requires: rubygem(%{mod_name}) = %{version} - -%description -n mailserver_agent -Mailserver DKIM agent provisioning agent - -%prep - -%build - -%install -%gem_install \ - --symlink-binaries \ - -f - -install -d %{buildroot}%{_sbindir} -install -d %{buildroot}%{_sysconfdir}/tomte -install -d %{buildroot}%{_localstatedir}/lib/tomte -install -d -m 0755 %{buildroot}%{_sysconfdir}/sudoers.d -install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d - -install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/mailserver_agent.service -install -D -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/mailserver_agent.conf -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmailserver_agent -install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tomte/mailserver_agent.yml -install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/tomte/tomte.yml -install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sudoers.d/mailserver_agent -install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/mailserver_agent - - -%gem_packages - - -%files -n mailserver_agent -%dir %{_sysconfdir}/tomte -%attr(0700, tomte, tomte) %dir %{_localstatedir}/lib/tomte - -%config(noreplace) %{_sysconfdir}/tomte/mailserver_agent.yml -%config(noreplace) %{_sysconfdir}/tomte/tomte.yml -%config %{_sysconfdir}/logrotate.d/mailserver_agent -%attr(0440, root, root) %config %{_sysconfdir}/sudoers.d/mailserver_agent - -%{_unitdir}/mailserver_agent.service -%{_tmpfilesdir}/mailserver_agent.conf - -%{_sbindir}/rcmailserver_agent -%ghost /run/mailserver_agent - - -%pre -n mailserver_agent -%{_bindir}/getent group tomte >/dev/null || %{_sbindir}/groupadd -r tomte -%{_bindir}/getent passwd tomte >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/tomte -s /bin/false -c "intercom mail policyd" -g tomte tomte -%service_add_pre mailserver_agent.service -exit 0 - -%preun -n mailserver_agent -%service_del_preun mailserver_agent.service -exit 0 - -%post -n mailserver_agent -%tmpfiles_create %_tmpfilesdir/mailserver_agent.conf -%service_add_post mailserver_agent.service -exit 0 - -%postun -n mailserver_agent -%service_del_postun mailserver_agent.service -exit 0 - -%changelog \ No newline at end of file
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.sudoers
Deleted
@@ -1,1 +0,0 @@ -tomte ALL=(root) NOPASSWD:/usr/sbin/rcamavis
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.tempfiles
Deleted
@@ -1,1 +0,0 @@ -d /run/mailserver_agent 0755 tomte tomte - - \ No newline at end of file
View file
mailserver_agent-1.0.2.gem/data/build/mailserver_agent.yml
Deleted
@@ -1,45 +0,0 @@ -development: - core: - log_level: debug - debug: false - hel: - host: HEL_ADDRESS - username: HEL_USERNAME - password: HEL_PASSWORD - raven: - dsn: - mailserver: - db: 'tmp/db.kch' - private_keys_path: 'tmp/keys' - amavis_config: 'tmp/amavis.cfg' - amavis_reload: '/bin/true' - -production: - core: - log_level: info - debug: false - hel: - host: HEL_ADDRESS - username: HEL_USERNAME - password: HEL_PASSWORD - raven: - dsn: - mailserver: - db: '/var/lib/tomte/dkim/domains.kch' - private_keys_path: '/var/lib/tomte/dkim/' - amavis_config: '/var/lib/tomte/dkim/amavis.cfg' - amavis_reload: 'sudo /usr/sbin/rcamavis restart' - -test: - core: - log_level: debug - debug: false - hel: - host: HEL_ADDRESS - username: HEL_USERNAME - password: HEL_PASSWORD - raven: - dsn: - mailserver: - db: '/path/to/db.kch' -
View file
mailserver_agent-1.0.2.gem/data/build/tomte.yml
Deleted
@@ -1,27 +0,0 @@ -_common: - # - # Core configuration parameters - # - protocol: - heartbeat: 30 - serialization: bson - - # Asynchronous clients - # Message buses to connect to - # - buses: - management: - adapter: amqp - uri: AMQP_URI - #logging: 'true' - timeout: 10 - - service: - adapter: amqp - uri: AMQP_URI - ssl: false - timeout: 10 - -production: - agents: - daemonize: true
View file
mailserver_agent-1.0.2.gem/checksums.yaml.gz -> mailserver_agent-1.0.3.gem/checksums.yaml.gz
Changed
@@ -1,7 +1,7 @@ --- SHA256: - metadata.gz: f5777568ea7081f973af4d9b493c4e83676d0c5185c1f0c1d477aaf6f5c8b836 - data.tar.gz: 51179869b49c3b193631383027a4bc54876634627201e5ebd30bb1d3c7aa706f + metadata.gz: a32b78418322c66b11e14cf2b8a90c82f2155895f30f9c8c9d73eaf569105496 + data.tar.gz: 6b4b7995e260022d2cac52d83c514894454ab82042559f8249890fe2bd2f17e6 SHA512: - metadata.gz: 481f4b4a297ea1720178be78e54813a76bf233e7edf17e966171637eb2378a9557f03732e60665c476673ff7bf7206e8a0b377c2c51da9787d57f8cf659328b0 - data.tar.gz: 81b2b6a3f1e216740d15a5a528c81055c0dfcf6947c2b234fddef48b376699f2bea41891d34249b544191001983bdc581aba571c58885853332ea85e08898b13 + metadata.gz: 22225fcfa4485fa57e0167d444366af318ca0279bf12640135274c8cd7078edb8547dcba352822bcf2c53cf3c5d92732cc04fd59fee24d188d8efc9e72d65487 + data.tar.gz: c1ac26e8ff64b402fe6375a6c124310002d0a80f392182766631f4cb12198cbbbd09d65efd61de6e305d3bb7afd1fd15bb347654855a9720a85be46470b00552
View file
mailserver_agent-1.0.2.gem/data/Gemfile.lock -> mailserver_agent-1.0.3.gem/data/Gemfile.lock
Changed
@@ -3,20 +3,18 @@ specs: ygg_provisioner (1.5.0) eventmachine (~> 1.2.3) - kyotocabinet publisher - sqlite3 - tomte-agents + tomte-agents (~> 1.1, >= 1.1.1) + tomte-core (~> 1.3, < 1.4.0) PATH remote: . specs: - mailserver_agent (1.0.1) - activeresource-hel (~> 0.5.0) - activesupport (~> 6.0) + mailserver_agent (1.0.2) + activeresource-hel (~> 0.7.0) sentry-raven (~> 3) tomte-agents (~> 1.1, >= 1.1.1) - tomte-core (~> 1.2, >= 1.2.1) + tomte-core (~> 1.3, < 1.4.0) tomte-protocol (~> 1.2, >= 1.2.0) ygg_provisioner (~> 1.5, >= 1.5.0) @@ -24,65 +22,77 @@ remote: http://rubygems.org/ remote: http://gems.intercom.it/ specs: - actionview (6.0.6.1) - activesupport (= 6.0.6.1) + actionview (8.0.3) + activesupport (= 8.0.3) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.0.6.1) - activesupport (= 6.0.6.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activemodel (8.0.3) + activesupport (= 8.0.3) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.6.1) - activemodel (= 6.0.6.1) - activesupport (= 6.0.6.1) - activeresource (5.1.1) - activemodel (>= 5.0, < 7) + activerecord (8.0.3) + activemodel (= 8.0.3) + activesupport (= 8.0.3) + timeout (>= 0.4.0) + activeresource (6.1.4) + activemodel (>= 6.0) activemodel-serializers-xml (~> 1.0) - activesupport (>= 5.0, < 7) - activeresource-hel (0.5.0.2) - activemodel (~> 6.0, >= 6.0.0) - activeresource (~> 5, >= 5.1.0) + activesupport (>= 6.0) + activeresource-hel (0.7.1) + activemodel (>= 6.0.0, < 9.0.0) + activeresource (>= 5.1.0, < 7.0.0) awesome_print (~> 1.8, >= 1.8.0) kaminari (~> 1.1, >= 1.1.1) - activesupport (6.0.6.1) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.8) - public_suffix (>= 2.0.2, < 8.0) - amq-protocol (2.3.0) + activesupport (8.0.3) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + amq-protocol (2.3.2) amqp (1.8.0) amq-protocol (>= 2.2.0) eventmachine awesome_print (1.9.2) - bigdecimal (3.3.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.8) bson (1.12.5) bson_ext (1.12.5) bson (~> 1.12.5) - builder (3.2.3) + builder (3.3.0) byebug (11.1.3) case (0.5.2.1) coderay (1.1.3) concurrent-ruby (1.3.5) - crack (1.0.1) + connection_pool (2.5.0) + crack (1.0.0) bigdecimal rexml crass (1.0.6) - diff-lcs (1.3) - erubi (1.10.0) - eventmachine (1.2.5) + diff-lcs (1.5.0) + drb (2.2.1) + erubi (1.13.1) + eventmachine (1.2.7) faraday (1.0.0) multipart-post (>= 1.2, < 3) - hashdiff (1.2.1) + hashdiff (1.1.2) i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.7.6) + json (2.9.1) kaminari (1.2.0) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.0) @@ -95,54 +105,58 @@ activerecord kaminari-core (= 1.2.0) kaminari-core (1.2.0) - kyotocabinet (1.33) - loofah (2.4.0) + logger (1.6.4) + loofah (2.23.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) method_source (1.1.0) - mime-types (3.3.1) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_portile2 (2.3.0) - minitest (5.15.0) - multipart-post (2.0.0) - nokogiri (1.8.5) - mini_portile2 (~> 2.3.0) + mime-types-data (3.2024.1001) + minitest (5.25.4) + multipart-post (2.4.1) + nokogiri (1.18.9) + racc (~> 1.4) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.7) + public_suffix (5.0.4) publisher (1.1.2) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + racc (1.8.1) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.3.0) - loofah (~> 2.3) - rake (12.3.3) - rexml (3.4.4) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rails-html-sanitizer (1.6.2) + loofah (~> 2.21) + nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + rake (13.2.1) + rexml (3.4.0) + rspec (3.13.2) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.6) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.7) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-support (3.10.2) + rspec-support (~> 3.13.0) + rspec-support (3.13.6) + securerandom (0.4.1) sentry-raven (3.0.0) faraday (>= 1.0) - sqlite3 (1.3.9) - thor (0.20.3) - thread_safe (0.3.6) + sqlite3 (2.1.0) + thor (1.4.0) + timeout (0.4.3) tomte-agents (1.1.1) tomte-core (>= 1.2.0) tomte-protocol (>= 1.1.1) - tomte-core (1.2.2) - activesupport (>= 5.0.0) + tomte-core (1.3.0) + activesupport (>= 7.2.0) bson (>= 1.12.5) bson_ext (>= 1.12.5) case (>= 0.5.2) @@ -156,29 +170,31 @@ tomte-protocol (1.2.3) amqp (>= 1.8.0) tomte-core (>= 1.2.0) - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uri (1.0.3) uuidtools (3.0.0) - webmock (3.25.0) + webmock (3.24.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) wml-compat (0.8.13) awesome_print (>= 1.1.0) uuidtools (>= 2.1.0) - zeitwerk (2.2.2) PLATFORMS - x86_64-linux + ruby + x86_64-linux-gnu DEPENDENCIES - byebug + byebug (~> 11.0, >= 11.1.3) mailserver_agent! - pry - rake - rspec - webmock + pry (~> 0.14, >= 0.14.0) + rake (~> 13.2, >= 13.2.1) + rspec (~> 3.10, >= 3.13.0) + sqlite3 (~> 2, >= 2.1.0) + webmock (~> 3, >= 3.24.0) ygg_provisioner! BUNDLED WITH - 2.2.34 + 2.6.7
View file
mailserver_agent-1.0.2.gem/data/lib/mailserver_agent/version.rb -> mailserver_agent-1.0.3.gem/data/lib/mailserver_agent/version.rb
Changed
@@ -1,3 +1,3 @@ module MailServerAgent - VERSION = "1.0.2" + VERSION = "1.0.3" end
View file
mailserver_agent-1.0.2.gem/data/lib/tomte/workers/mailserver_worker_pubsub.rb -> mailserver_agent-1.0.3.gem/data/lib/tomte/workers/mailserver_worker_pubsub.rb
Changed
@@ -1,23 +1,7 @@ module Tomte::Workers class MailServerWorkerPubsub < Tomte::Worker - - bus :service, :enveloper => Tomte::Protocol::Enveloper::Generic do |ep| - consumer = ep.consumer :queue => "ygg.email.events.#{Tomte.config:local:host}", :ack => false - consumer.connect! do |c| - c.declare_exchange('ygg.email.events', :topic, :auto_delete => true) do - c.bind('ygg.email.events') - c.consume { log.info "ready to receive messages on ygg.email.events" } - end - - consumer.prefetch 1 - c.consume { log.info "ready to receive messages" } - - log.debug '+ Sync database' - @sync.sync - @sync = nil - end - - consumer.on_delivery do |metadata, message| + def execute_on_delivery(metadata, message) + begin log.debug "received message" log.debug message.ai ygg_obj = load_ygg_obj message @@ -38,7 +22,7 @@ else log.info "* Unhandled object type #{ygg_obj.class.name}" end - rescue + rescue ex = $! if defined?(Raven) Raven.extra_context(message: message, metadata: metadata.attributes) do @@ -50,6 +34,28 @@ end end + + bus :service, :enveloper => Tomte::Protocol::Enveloper::Generic do |ep| + consumer = ep.consumer :queue => "ygg.email.events.#{Tomte.config:local:host}", :ack => false + consumer.connect! do |c| + c.declare_exchange('ygg.email.events', :topic, :auto_delete => true) do + c.bind('ygg.email.events') + c.consume { log.info "ready to receive messages on ygg.email.events" } + end + + consumer.prefetch 1 + c.consume { log.info "ready to receive messages" } + + log.debug '+ Sync database' + @sync.sync + @sync = nil + end + + consumer.on_delivery do |metadata, message| + execute_on_delivery metadata, message + end + end + def init(options = {}) log.debug '+ Fetch service data' @sync = ::MailServerAgent::BulkSync.new @@ -63,10 +69,10 @@ obj = klass.new(data:object) end obj - rescue + rescue log.error '* ' + $!.to_s log.error '* ' + $!.backtrace.join("\n* ") nil end end -end \ No newline at end of file +end
View file
mailserver_agent-1.0.2.gem/data/mailserver_agent.gemspec -> mailserver_agent-1.0.3.gem/data/mailserver_agent.gemspec
Changed
@@ -13,22 +13,22 @@ s.homepage = 'https://intercom.it' s.license = 'MIT' - s.files = `git ls-files`.split("\n").reject{|f| f.start_with?('.') } + s.files = `git ls-files`.split("\n").reject{|f| f.start_with?('.') || f.start_with?('build/') } s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) } s.test_files = s.files.grep(%r{^(test|spec|features)/}) s.require_paths = 'lib' s.add_dependency 'tomte-agents', '~> 1.1', '>= 1.1.1' - s.add_dependency 'tomte-core', '~> 1.2', '>= 1.2.1' + s.add_dependency 'tomte-core', '~> 1.3', '< 1.4.0' s.add_dependency 'tomte-protocol', '~> 1.2', '>= 1.2.0' - s.add_dependency 'activesupport', '~> 6.0' s.add_dependency 'ygg_provisioner', '~> 1.5', '>= 1.5.0' - s.add_dependency 'activeresource-hel', '~> 0.5.0' + s.add_dependency 'activeresource-hel', '~> 0.7.0' s.add_dependency 'sentry-raven', '~> 3' - s.add_development_dependency 'byebug', '~> 11.1', '>= 11.1.30' - s.add_development_dependency 'webmock', '~> 3.25', '>= 3.25.0' - s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0' - s.add_development_dependency 'pry', '~> 0.14', '>= 0.14.0' - s.add_development_dependency 'rspec', '~> 3.10', '>= 3.10.0' + s.add_development_dependency "rake", '~> 13.2', '>= 13.2.1' + s.add_development_dependency "pry", '~> 0.14', '>= 0.14.0' + s.add_development_dependency "rspec", '~> 3.10', '>= 3.13.0' + s.add_development_dependency "byebug", '~> 11.0', '>= 11.1.3' + s.add_development_dependency "webmock", '~> 3', '>= 3.24.0' + s.add_development_dependency "sqlite3", '~> 2', '>= 2.1.0' end
View file
mailserver_agent-1.0.2.gem/metadata.gz -> mailserver_agent-1.0.3.gem/metadata.gz
Changed
@@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: mailserver_agent version: !ruby/object:Gem::Version - version: 1.0.2 + version: 1.0.3 platform: ruby authors: - Angelo Grossini -autorequire: +autorequire: bindir: bin cert_chain: -date: 2025-12-02 00:00:00.000000000 Z +date: 2026-01-15 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: tomte-agents @@ -36,20 +36,20 @@ requirements: - - "~>" - !ruby/object:Gem::Version - version: '1.2' - - - ">=" + version: '1.3' + - - "<" - !ruby/object:Gem::Version - version: 1.2.1 + version: 1.4.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '1.2' - - - ">=" + version: '1.3' + - - "<" - !ruby/object:Gem::Version - version: 1.2.1 + version: 1.4.0 - !ruby/object:Gem::Dependency name: tomte-protocol requirement: !ruby/object:Gem::Requirement @@ -71,20 +71,6 @@ - !ruby/object:Gem::Version version: 1.2.0 - !ruby/object:Gem::Dependency - name: activesupport - requirement: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '6.0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '6.0' -- !ruby/object:Gem::Dependency name: ygg_provisioner requirement: !ruby/object:Gem::Requirement requirements: @@ -110,14 +96,14 @@ requirements: - - "~>" - !ruby/object:Gem::Version - version: 0.5.0 + version: 0.7.0 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: 0.5.0 + version: 0.7.0 - !ruby/object:Gem::Dependency name: sentry-raven requirement: !ruby/object:Gem::Requirement @@ -133,105 +119,125 @@ - !ruby/object:Gem::Version version: '3' - !ruby/object:Gem::Dependency - name: byebug + name: rake requirement: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '11.1' + version: '13.2' - - ">=" - !ruby/object:Gem::Version - version: 11.1.30 + version: 13.2.1 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '11.1' + version: '13.2' - - ">=" - !ruby/object:Gem::Version - version: 11.1.30 + version: 13.2.1 - !ruby/object:Gem::Dependency - name: webmock + name: pry requirement: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.25' + version: '0.14' - - ">=" - !ruby/object:Gem::Version - version: 3.25.0 + version: 0.14.0 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.25' + version: '0.14' - - ">=" - !ruby/object:Gem::Version - version: 3.25.0 + version: 0.14.0 - !ruby/object:Gem::Dependency - name: rake + name: rspec + requirement: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '3.10' + - - ">=" + - !ruby/object:Gem::Version + version: 3.13.0 + type: :development + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '3.10' + - - ">=" + - !ruby/object:Gem::Version + version: 3.13.0 +- !ruby/object:Gem::Dependency + name: byebug requirement: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '12.3' + version: '11.0' - - ">=" - !ruby/object:Gem::Version - version: 12.3.0 + version: 11.1.3 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '12.3' + version: '11.0' - - ">=" - !ruby/object:Gem::Version - version: 12.3.0 + version: 11.1.3 - !ruby/object:Gem::Dependency - name: pry + name: webmock requirement: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '0.14' + version: '3' - - ">=" - !ruby/object:Gem::Version - version: 0.14.0 + version: 3.24.0 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '0.14' + version: '3' - - ">=" - !ruby/object:Gem::Version - version: 0.14.0 + version: 3.24.0 - !ruby/object:Gem::Dependency - name: rspec + name: sqlite3 requirement: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.10' + version: '2' - - ">=" - !ruby/object:Gem::Version - version: 3.10.0 + version: 2.1.0 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - "~>" - !ruby/object:Gem::Version - version: '3.10' + version: '2' - - ">=" - !ruby/object:Gem::Version - version: 3.10.0 + version: 2.1.0 description: Intercom mail DKIM provisioning agent email: - angelo@intercom.it @@ -242,19 +248,11 @@ extensions: extra_rdoc_files: files: -- Dockerfile - Gemfile - Gemfile.lock - bin/mailserver_agent - bin/mailserver_agent_convert_store - bin/mailserver_agent_shell -- build/mailserver_agent.logrotate -- build/mailserver_agent.service -- build/mailserver_agent.spec.in -- build/mailserver_agent.sudoers -- build/mailserver_agent.tempfiles -- build/mailserver_agent.yml -- build/tomte.yml - lib/mailserver_agent.rb - lib/mailserver_agent/version.rb - lib/mailserver_agent/ygg.rb @@ -271,7 +269,7 @@ licenses: - MIT metadata: {} -post_install_message: +post_install_message: rdoc_options: require_paths: - lib @@ -286,9 +284,8 @@ - !ruby/object:Gem::Version version: '0' requirements: -rubyforge_project: -rubygems_version: 2.7.6.3 -signing_key: +rubygems_version: 3.5.22 +signing_key: specification_version: 4 summary: Mail agent test_files:
View file
mailserver_agent.logrotate
Changed
@@ -7,8 +7,8 @@ notifempty missingok copytruncate - su tomte tomte - create 0644 tomte tomte + su mailserver_agent mailserver_agent + create 0644 mailserver_agent mailserver_agent postrotate systemctl restart mailserver_agent.service endscript
View file
mailserver_agent.service
Changed
@@ -3,11 +3,11 @@ Service Type=simple -User=tomte -Group=tomte +User=mailserver_agent +Group=vscan PIDFile=/run/mailserver_agent/mailserver_agent.pid -ExecStart=/usr/sbin/mailserver_agent --pidfile /run/mailserver_agent/mailserver_agent.pid -e production --no-daemonize -WorkingDirectory=/var/lib/tomte +ExecStart=/usr/bin/mailserver_agent --pidfile /run/mailserver_agent/mailserver_agent.pid -e production --no-daemonize +WorkingDirectory=/var/lib/mailserver_agent Restart=always Install
View file
mailserver_agent.sudoers
Changed
@@ -1,1 +1,1 @@ -tomte ALL=(root) NOPASSWD:/usr/sbin/rcamavis +mailserver_agent ALL=(root) NOPASSWD:/usr/sbin/rcamavis
View file
mailserver_agent.sysuser
Added
@@ -0,0 +1,3 @@ +#Type Name ID GECOS Home +u mailserver_agent - "intercom mail mailserver agent" /var/lib/mailserver_agent +m mailserver_agent vscan \ No newline at end of file
View file
mailserver_agent.tempfiles
Changed
@@ -1,1 +1,1 @@ -d /run/mailserver_agent 0755 tomte tomte - - \ No newline at end of file +d /run/mailserver_agent 0755 mailserver_agent mailserver_agent - - \ No newline at end of file
View file
mailserver_agent.yml
Changed
@@ -1,21 +1,6 @@ -development: - core: - log_level: debug - debug: false - hel: - host: HEL_ADDRESS - username: HEL_USERNAME - password: HEL_PASSWORD - raven: - dsn: - mailserver: - db: 'tmp/db.kch' - private_keys_path: 'tmp/keys' - amavis_config: 'tmp/amavis.cfg' - amavis_reload: '/bin/true' - production: core: + log_path: /var/log/tomte/mailserver_agent log_level: info debug: false hel: @@ -25,21 +10,7 @@ raven: dsn: mailserver: - db: '/var/lib/tomte/dkim/domains.kch' - private_keys_path: '/var/lib/tomte/dkim/' - amavis_config: '/var/lib/tomte/dkim/amavis.cfg' - amavis_reload: 'sudo /usr/sbin/rcamavis restart' - -test: - core: - log_level: debug - debug: false - hel: - host: HEL_ADDRESS - username: HEL_USERNAME - password: HEL_PASSWORD - raven: - dsn: - mailserver: - db: '/path/to/db.kch' - + db: '/var/lib/mailserver_agent/dkim/domains.mdb' + private_keys_path: '/var/lib/mailserver_agent/dkim/' + amavis_config: '/var/lib/mailserver_agent/dkim/amavis.cfg' + amavis_reload: 'sudo /usr/sbin/rcamavis restart' \ No newline at end of file
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.