diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsHandler.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsHandler.java index aeda32680..87da0ccb8 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsHandler.java @@ -22,17 +22,20 @@ import static net.i2p.update.UpdateMethod.*; class NewsHandler extends UpdateHandler implements Checker { /** - * Changed in 0.9.11 to the b32 for psi.i2p, run by psi. - * We may be able to change it to psi.i2p in a future release after - * the hostname propagates. + * NOTE: If you change, also change in Android: + * app/src/main/java/net/i2p/android/apps/NewsFetcher.java * * @since 0.7.14 not configurable */ + // psi.i2p //private static final String BACKUP_NEWS_URL = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.xml"; //private static final String BACKUP_NEWS_URL_SU3 = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.su3"; // str4d - private static final String BACKUP_NEWS_URL = "http://ivk5a6wfjar6hjucjmnbcea5inwmwg5b3hsv72x77xwyhbeaajja.b32.i2p/news/news.xml"; - private static final String BACKUP_NEWS_URL_SU3 = "http://ivk5a6wfjar6hjucjmnbcea5inwmwg5b3hsv72x77xwyhbeaajja.b32.i2p/news/news.su3"; + //private static final String BACKUP_NEWS_URL = "http://ivk5a6wfjar6hjucjmnbcea5inwmwg5b3hsv72x77xwyhbeaajja.b32.i2p/news/news.xml"; + //private static final String BACKUP_NEWS_URL_SU3 = "http://ivk5a6wfjar6hjucjmnbcea5inwmwg5b3hsv72x77xwyhbeaajja.b32.i2p/news/news.su3"; + // idk + private static final String BACKUP_NEWS_URL = "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/news.atom.xml"; + private static final String BACKUP_NEWS_URL_SU3 = "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/news.su3"; public NewsHandler(RouterContext ctx, ConsoleUpdateManager mgr) { super(ctx, mgr); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java index a1e9c0261..097bd5c9a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java @@ -38,7 +38,12 @@ public class ConfigUpdateHandler extends FormHandler { public static final String DEFAULT_NEWS_URL = "http://echelon.i2p/i2p/news.xml"; /** old default */ public static final String OLD_DEFAULT_NEWS_URL_SU3 = "http://echelon.i2p/news/news.su3"; - /** current default, i2pnews.i2p, run by echelon */ + /** + * current default, i2pnews.i2p, run by echelon + * + * NOTE: If you change, also change in Android: + * app/src/main/java/net/i2p/android/apps/NewsFetcher.java + */ public static final String DEFAULT_NEWS_URL_SU3 = "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3"; public static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency"; public static final long DEFAULT_REFRESH_FREQ = 36*60*60*1000l; diff --git a/installer/resources/certificates/news/hankhill19580_at_gmail.com.crt b/installer/resources/certificates/news/hankhill19580_at_gmail.com.crt new file mode 100644 index 000000000..bd2c08a19 --- /dev/null +++ b/installer/resources/certificates/news/hankhill19580_at_gmail.com.crt @@ -0,0 +1,33 @@ +-----BEGIN CERTIFICATE----- +MIIFtTCCA52gAwIBAgIJG3WxGGQxbeAUMA0GCSqGSIb3DQEBDQUAMF4xHjAcBgNV +BAcTFUkyUCBBbm9ueW1vdXMgTmV0d29yazEMMAoGA1UEChMDSTJQMQwwCgYDVQQL +EwNJMlAxIDAeBgNVBAMMF2hhbmtoaWxsMTk1ODBAZ21haWwuY29tMB4XDTE5MDQy +MTE4MjIzOVoXDTI5MDQyMTE4MjIzOVowXjEeMBwGA1UEBxMVSTJQIEFub255bW91 +cyBOZXR3b3JrMQwwCgYDVQQKEwNJMlAxDDAKBgNVBAsTA0kyUDEgMB4GA1UEAwwX +aGFua2hpbGwxOTU4MEBnbWFpbC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw +ggIKAoICAQCJKp9niMqRPkHIG79QNzgHjedpg8dr8dM+Oc+/qvNtKL0quU1DB6AY +Vby/2NZ3fWsRwPExKTUC1P9lZhMZylkWu0HG1zl1BW0kHu6b+isbMkC3MOAO2aMG +59hg96V3E1NrV593DajBkwCd74aY3GhEO7oRPbh712q9Q9E5Qgvzt7epCBNN6ejc +KdFuXhE3MHopWGEwf3o7FBWM4AjDA5Vn4d4Hq7qb+sj9Wjlbenw7g5u5mdiWjJ57 +wBXxwinpAIoyyyMxffGWrfArtsJvXSOMHosMBXajdEU7rfXec56ybUvfI/DyGtoN +JjgTSvBwyemIG3BXjW58H9LHr2LQSlFUcDwOPI2ohk7fp+aTQIsxJaH/Yf+cVA+I +Q+F/HghdIw/E+MkBz6VaRvQ0i9zhbuK+zRsPUmPDL4qHjpihWwKM9bY0LmfiJ7rk +3Tqo1Rkxi+RKHqRveMoOUiN3Ii9iJo6fq+HydgDfMJQHOIEP0DKwZ8B6s1nLnlpt +V8xJG/+gLpV1pGOao/qE2m2m1HdiwI1r+jlu4PKWS1K6i3nufYa9fazktwZmxTsv +C5rdJYU2biiJE2QTn5gJQCC+vwvhA3+wQ4dKZME5/WfbnPztGaEz1xLUUkPBarY6 +AWwiRhU6hsvLPOYQmoJ4y7bitPB+1+G9E3daMI0JOus3svDvLashIQIDAQABo3Yw +dDAdBgNVHQ4EFgQUsS2/2FnWJJqBvcmw/0ie0WLhfBwwHwYDVR0jBBgwFoAUsS2/ +2FnWJJqBvcmw/0ie0WLhfBwwDgYDVR0PAQH/BAQDAgGmMCIGA1UdEQQbMBmBF2hh +bmtoaWxsMTk1ODBAZ21haWwuY29tMA0GCSqGSIb3DQEBDQUAA4ICAQAQRg9gDt+L +mVgC9uvf7+rJOxXLLV2mN9o4defXpPoAGWZot7LQ0LSxLYZ0KC2nwVxS9shojFUL +Nu3EAfZKVQQMRaVl9+xCMPrxcdcj8LncnVl8TZ4dol1wFDHkMxYniHjIt9jwXOAb +g8DBoK+Lj9LN9Cx1uIk7d4RkuzciWC2psVN9/xp4KnTGLh3plPswbJ9YNI7B5vME +V4SDW3DZojNL57jgg/f+AiGqYmVHGctnDVbqoGpDqNBr6je2WhSPc3h+O0tJsSY9 +HTF+wkOGM7v2IK1+vFRcHNWKLP0E+YGbICExSHoK3vNU3AUtEFBRmE+4Yjkowzu1 +ruASM+r+GP8e59q+3VnjzcKNF52FKJm2KXeKfPlDxamqQR6vM92kIfICskt/V9++ +qUNKeT8xHI1YpffCSF3ZH6j4+LwLFys+0DMMjgaBL3SwsiLAnT8lBhmaj5nK8BTw +ttW61il/Vh0hgiVuq2UPhdUyavOTlLvXaq5L+Y0N+IWXe3143TnWZhi4fbNdn1A8 +HriKmYmSECEarVNO17O/wGHnYUX0m1n7OvXTiOV8Z8W632t7M20ijAqsfNuq2OdM +DSPRg4UuiLtVGjIQSLOkf5Q0llgkh7+L+jWzz8n148ZUtrWf/gFEtdC/q/t7BLEe +u0JCDYsPU4/da1GMwkdiz+5HSSNsz9AJKw== +-----END CERTIFICATE-----