misc: move *.ring.cx to *.jami.net

Change-Id: I1ab42b470f75aa1291aaebd625bfa11984258080
savoirfairelinux · Dec 5, 2018 · 812b7b0 · 812b7b0
1 parent 4f26d8e
commit 812b7b0
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/CODING b/CODING
@@ -1,12 +1,12 @@
 = Coding Standards =
 
 Please follow our coding standards when developing:
-https://tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php?title=Libring_-_Coding_Rules
+https://git.ring.cx/savoirfairelinux/ring-project/wikis/guidelines/Libring-coding-rules
 
 = Gerrit Workflow =
 
 Gerrit is used as a code review tool. It is also the primary Git repository.
-Wiki documentation: https://tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php?title=Working_with_Gerrit
+Wiki documentation: https://git.ring.cx/savoirfairelinux/ring-project/wikis/tutorials/Working-with-gerrit
 
 == Commit Messages ==
 

diff --git a/README b/README
@@ -34,7 +34,7 @@ the shell.
 GNU Ring is currently used by the support team of Savoir-faire Linux Inc.
 
 More information is available on the project homepage:
-  https://www.ring.cx/
+  https://www.jami.net/
 
 This source tree contains the daemon application only, DRing, that handles
 the business logic of GNU Ring. UIs are located in differents repositories. See
@@ -79,7 +79,7 @@ make install
 Done !
 
 More details available here:
-https://tuleap.ring.cx/plugins/mediawiki/wiki/ring/index.php/Build_Instructions
+https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions
 
 
 How to compile on OSX
@@ -169,7 +169,7 @@ Contributing to GNU Ring
 Of course we love patches. And contributions. And spring rolls.
 
 Development website / Bug Tracker:
- - https://tuleap.ring.cx/projects/ring/
+ - https://git.jami.net/savoirfairelinux/ring-project
 
 Repositories are hosted on Gerrit, which we use for code review. It also
 contains the client subprojects:

diff --git a/astylerc b/astylerc
@@ -3,7 +3,7 @@
 #           http://astyle.sourceforge.net/astyle.html
 # Author:  Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
 #          Savoir-faire Linux Inc
-#          https://www.ring.cx
+#          https://jami.net
 
 style=stroustrup    # stroustrup style http://astyle.sourceforge.net/astyle.html#_style=stroustrup
 indent=spaces=4     # Use spaces instead of tabs for indentation

diff --git a/bin/main.cpp b/bin/main.cpp
@@ -53,9 +53,9 @@ static void
 print_title()
 {
     std::cout
-        << "Ring Daemon " << DRing::version()
+        << "Jami Daemon " << DRing::version()
         << ", by Savoir-faire Linux 2004-2018" << std::endl
-        << "https://www.ring.cx/" << std::endl
+        << "https://jami.net/" << std::endl
 #ifdef RING_VIDEO
         << "[Video support enabled]" << std::endl
 #endif

diff --git a/bin/osxmain.cpp b/bin/osxmain.cpp
@@ -44,7 +44,7 @@ print_title()
     std::cout
         << "Ring Daemon " << DRing::version()
         << ", by Savoir-faire Linux 2004-2018" << std::endl
-        << "https://www.ring.cx/" << std::endl
+        << "https://jami.net/" << std::endl
 #ifdef RING_VIDEO
         << "[Video support enabled]" << std::endl
 #endif

diff --git a/bin/winmain.cpp b/bin/winmain.cpp
@@ -48,7 +48,7 @@ print_title()
     std::cout
         << "Ring Daemon " << DRing::version()
         << ", by Savoir-faire Linux 2004-2018" << std::endl
-        << "https://www.ring.cx/" << std::endl
+        << "https://jami.net/" << std::endl
 #ifdef RING_VIDEO
         << "[Video support enabled]" << std::endl
 #endif

diff --git a/doc/README b/doc/README
@@ -1,3 +1,3 @@
 This directory holds all the documentation files. This documentation
-is made available online on the ring.cx website, as well as in other
+is made available online on the jami.net website, as well as in other
 documentation areas.
diff --git a/src/media/media_recorder.cpp b/src/media/media_recorder.cpp
@@ -269,7 +269,7 @@ MediaRecorder::initRecord()
     encoderOptions["title"] = title_;
 
     if (description_.empty()) {
-        description_ = "Recorded with Ring https://ring.cx";
+        description_ = "Recorded with Jami https://jami.net";
     }
     description_ = replaceAll(description_, "%TIMESTAMP", timestampString.str());
     encoderOptions["description"] = description_;

diff --git a/src/media/media_recorder.h b/src/media/media_recorder.h
@@ -52,7 +52,7 @@ class MediaRecorder {
 
         // replaces %TIMESTAMP with time at start of recording
         // default title: "Conversation at %Y-%m-%d %H:%M:%S"
-        // default description: "Recorded with Ring https://ring.cx"
+        // default description: "Recorded with Jami https://jami.net"
         void setMetadata(const std::string& title, const std::string& desc);
 
         [[deprecated("use setPath to set full recording path")]]

diff --git a/src/ringdht/namedirectory.h b/src/ringdht/namedirectory.h
@@ -56,7 +56,7 @@ class NameDirectory
 private:
     NON_COPYABLE(NameDirectory);
     NameDirectory(NameDirectory&&) = delete;
-    constexpr static const char* const DEFAULT_SERVER_HOST = "ns.ring.cx";
+    constexpr static const char* const DEFAULT_SERVER_HOST = "ns.jami.net";
 
     const std::string serverHost_ {DEFAULT_SERVER_HOST};
     const std::string cachePath_;

diff --git a/src/ringdht/p2p.cpp b/src/ringdht/p2p.cpp
@@ -413,7 +413,7 @@ DhtPeerConnector::Impl::turnConnect()
     auto password = details[Conf::CONFIG_TURN_SERVER_PWD];
 
     auto turn_param_v4 = TurnTransportParams {};
-    turn_param_v4.server = IpAddr {server.empty() ? "turn.ring.cx" : server};
+    turn_param_v4.server = IpAddr {server.empty() ? "turn.jami.net" : server};
     turn_param_v4.realm = realm.empty() ? "ring" : realm;
     turn_param_v4.username = username.empty() ? "ring" : username;
     turn_param_v4.password = password.empty() ? "ring" : password;

diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
@@ -211,7 +211,7 @@ static constexpr auto TLS_TIMEOUT = std::chrono::seconds(30);
 const constexpr auto EXPORT_KEY_RENEWAL_TIME = std::chrono::minutes(20);
 
 static constexpr const char * const RING_URI_PREFIX = "ring:";
-static constexpr const char * DEFAULT_TURN_SERVER = "turn.ring.cx";
+static constexpr const char * DEFAULT_TURN_SERVER = "turn.jami.net";
 static constexpr const char * DEFAULT_TURN_USERNAME = "ring";
 static constexpr const char * DEFAULT_TURN_PWD = "ring";
 static constexpr const char * DEFAULT_TURN_REALM = "ring";

diff --git a/src/ringdht/ringaccount.h b/src/ringdht/ringaccount.h
@@ -85,8 +85,8 @@ class RingAccount : public SIPAccountBase {
     public:
         constexpr static const char* const ACCOUNT_TYPE = "RING";
         constexpr static const in_port_t DHT_DEFAULT_PORT = 4222;
-        constexpr static const char* const DHT_DEFAULT_BOOTSTRAP = "bootstrap.ring.cx";
-        constexpr static const char* const DHT_DEFAULT_PROXY = "dhtproxy.ring.cx";
+        constexpr static const char* const DHT_DEFAULT_BOOTSTRAP = "bootstrap.jami.net";
+        constexpr static const char* const DHT_DEFAULT_PROXY = "dhtproxy.jami.net";
         constexpr static const char* const DHT_TYPE_NS = "cx.ring";
 
         /* constexpr */ static const std::pair<uint16_t, uint16_t> DHT_PORT_RANGE;

diff --git a/test/turn/test_TURN.cpp b/test/turn/test_TURN.cpp
@@ -88,7 +88,7 @@ void
 test_TURN::testSimpleConnection()
 {
     TurnTransportParams param;
-    param.server = IpAddr {"turn.ring.cx"};
+    param.server = IpAddr {"turn.jami.net"};
     param.realm = "ring";
     param.username = "ring";
     param.password = "ring";