Uploaded image for project: 'openATTIC'
  1. openATTIC
  2. OP-1446

Remove vagrant/required-changes.patch

    XMLWordPrintable

    Details

      Description

      This patch is ugly, we need to remove it.

      diff -r 6c276d24d4ba backend/nagios/readstatus.py
      --- a/backend/nagios/readstatus.py	Wed Aug 10 13:19:25 2016 +0200
      +++ b/backend/nagios/readstatus.py	Wed Aug 10 13:20:23 2016 +0200
      @@ -38,8 +38,11 @@
               self.lock        = Lock()
       
           def __getitem__(self, name):
      -        self.update()
      -        return self.nagstate[name]
      +        try:
      +            self.update()
      +            return self.nagstate[name]
      +        except SystemError:
      +            return []
       
           def __len__(self):
               self.update()
      

      This happend, because there is no nagios status file. What is the intended behavior then?

      diff -r 6c276d24d4ba backend/peering/models.py
      --- a/backend/peering/models.py	Wed Aug 10 13:19:25 2016 +0200
      +++ b/backend/peering/models.py	Wed Aug 10 13:20:23 2016 +0200
      @@ -108,8 +108,8 @@
                        active=True)
           key.full_clean()
           key.save()
      -    peer = PeerHost(host=localhost, base_url=("http://__:%s@%s:31234/" % (key.apikey, localhost.name)))
      -    peer.full_clean()
      -    peer.save()
      +    #peer = PeerHost(host=localhost, base_url=("http://__:%s@%s:31234/" % (key.apikey, localhost.name)))
      +    #peer.full_clean()
      +    #peer.save()
       
       sysutils.models.post_install.connect(__install_hostkeys, sender=sysutils.models)
      

      This is fixed as soon as the XML RPC Daemon is gone.

      diff -r 6c276d24d4ba backend/settings.py
      --- a/backend/settings.py	Wed Aug 10 13:19:25 2016 +0200
      +++ b/backend/settings.py	Wed Aug 10 13:20:23 2016 +0200
      @@ -211,7 +211,7 @@
               'file': {
                   'level': 'INFO',
                   'class': 'logging.FileHandler',
      -            'filename': '/var/log/openattic/openattic.log'
      +            'filename': '/dev/stdout'
               }
           },
           'loggers': {
      

      Logging to syslog would be an option?

      diff -r 6c276d24d4ba etc/dbus-1/system.d/openattic.conf
      --- a/etc/dbus-1/system.d/openattic.conf	Wed Aug 10 13:19:25 2016 +0200
      +++ b/etc/dbus-1/system.d/openattic.conf	Wed Aug 10 13:20:23 2016 +0200
      @@ -7,7 +7,7 @@
                   <allow send_destination="org.openattic.systemd" />
                   <allow receive_sender="org.openattic.systemd"   />
           </policy>
      -    <policy user="openattic">
      +    <policy user="vagrant">
                   <allow send_destination="org.openattic.systemd" />
                   <allow receive_sender="org.openattic.systemd"   />
           </policy>
      

      No idea atm of how to fix this dbus file.

      diff -r 6c276d24d4ba etc/tmpfiles.d/openattic.conf
      --- a/etc/tmpfiles.d/openattic.conf	Wed Aug 10 13:19:25 2016 +0200
      +++ b/etc/tmpfiles.d/openattic.conf	Wed Aug 10 13:20:23 2016 +0200
      @@ -1,1 +1,1 @@
      -d /run/lock/openattic 0755 openattic openattic -
      +d /run/lock/openattic 0755 vagrant users -
      

      Could be removed by echo 'd /run/lock/openattic 0755 vagrant users -' > /etc/tmpfiles.d/openattic.conf?

      diff -r 6c276d24d4ba webui/app/config.js
      --- a/webui/app/config.js	Wed Aug 10 13:19:25 2016 +0200
      +++ b/webui/app/config.js	Wed Aug 10 13:20:23 2016 +0200
      @@ -1,6 +1,6 @@
       var globalConfig = {
         "API": {
      -    "URL": "/openattic/api/"
      +    "URL": "/api/"
         },
         "GUI": {
           "activeModules": {
      

      Stephan Müller is there a local config.js that is not part of the repository?

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              vtheile Theile, Volker
              Reporter:
              swagner Sebastian Wagner
              Votes:
              2 Vote for this issue
              Watchers:
              4 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: