Commit fca73868 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Update paths.

parent b5686906

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
.project



# Generated web archive

ernie.war

website/metrics.war



# Compiled class files

classes/

modules/legacy/config.template

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ImportDirectoryArchives 0

#

## Relative path to directory to import directory archives from

#DirectoryArchivesDirectory /srv/metrics.torproject.org/web/shared/in/recent/relay-descriptors/

#DirectoryArchivesDirectory /srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/

#

## Keep a history of imported directory archive files to know which files

## have been imported before. This history can be useful when importing
@@ -14,7 +14,7 @@ 
#ImportSanitizedBridges 0

#

## Relative path to directory to import sanitized bridges from

#SanitizedBridgesDirectory /srv/metrics.torproject.org/web/shared/in/recent/bridge-descriptors/

#SanitizedBridgesDirectory /srv/metrics.torproject.org/metrics/shared/in/recent/bridge-descriptors/

#

## Keep a history of imported sanitized bridge descriptors. This history

## can be useful when importing from a changing data source to avoid
@@ -43,5 +43,5 @@ 
#ImportWriteTorperfStats 0

#

## Relative path to directory to import torperf results from

#TorperfDirectory /srv/metrics.torproject.org/web/shared/in/recent/torperf/

#TorperfDirectory /srv/metrics.torproject.org/metrics/shared/in/recent/torperf/

#

website/build.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
  <!-- Create a .war file for deployment. -->

  <target name="war"

          depends="compile">

    <war destfile="ernie.war"

    <war destfile="metrics.war"

         webxml="etc/web.xml">

      <fileset dir="web"/>

      <lib dir="lib">

website/etc/web.xml

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 
    <init-param>

      <param-name>statsDir</param-name>

      <param-value>

        /srv/metrics.torproject.org/web/shared/stats/

        /srv/metrics.torproject.org/metrics/shared/stats/

      </param-value>

    </init-param>

  </servlet>
@@ -330,7 +330,7 @@ 
  <context-param>

    <param-name>cachedGraphsDir</param-name>

    <param-value>

      /srv/metrics.torproject.org/web/rserve/graphs/

      /srv/metrics.torproject.org/metrics/website/rserve/graphs/

    </param-value>

  </context-param>

website/rserve/Rserv.conf

+1 −1
Original line number Diff line number Diff line 
workdir /srv/metrics.torproject.org/web/rserve/workdir

workdir /srv/metrics.torproject.org/metrics/website/rserve/workdir

source rserve-init.R