mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Merge branch 'dejal' into catalyst
This commit is contained in:
David Sinclair
commit
2cdaa654ea
26 changed files with 65 additions and 82 deletions
|
|
@ -16,6 +16,9 @@ groups:
|
|||
node: inventory_hostname.startswith('node')
|
||||
node_socket: inventory_hostname.startswith('node-socket')
|
||||
node_images: inventory_hostname.startswith('node-images')
|
||||
node_text: inventory_hostname.startswith('node-text')
|
||||
node_page: inventory_hostname.startswith('node-page')
|
||||
node_favicons: inventory_hostname.startswith('node-favicons')
|
||||
|
||||
# debugs: inventory_hostname.startswith('debug')
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
],
|
||||
"checks": [{
|
||||
"id": "consul-manager",
|
||||
"http": "http://{{ ansible_ssh_host }}:8500",
|
||||
"http": "http://{{ ansible_host }}:8500",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}],
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"port": 9200,
|
||||
"checks": [{
|
||||
"id": "es-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/elasticsearch",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/elasticsearch",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
],
|
||||
"checks": [{
|
||||
"id": "grafana-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:3000/api/health",
|
||||
"http": "http://{{ ansible_host }}:3000/api/health",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}],
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
"checks": [
|
||||
{
|
||||
"id": "{{inventory_hostname}}-exporter-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:9216",
|
||||
"http": "http://{{ ansible_host }}:9216",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"port": 27017,
|
||||
"checks": [{
|
||||
"id": "mongo-analytics-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/mongo_analytics?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/mongo_analytics?consul=1",
|
||||
"interval": "15s"
|
||||
}]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"port": 27017,
|
||||
"checks": [{
|
||||
"id": "mongo-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/mongo?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/mongo?consul=1",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
"checks": [
|
||||
{
|
||||
"id": "{{inventory_hostname}}-node-exporter-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:9100",
|
||||
"http": "http://{{ ansible_host }}:9100",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
"checks": [{
|
||||
"id": "{{inventory_hostname}}-ping",
|
||||
{% if item.target_host == "node-images" %}
|
||||
"http": "http://{{ ansible_ssh_host }}:{{ item.port }}/sc,seLJDaKBog3LLEMDe8cjBefMhnVSibO4RA5boZhWcVZ0=/https://samuelclay.com/static/images/2019%20-%20Cuba.jpg",
|
||||
"http": "http://{{ ansible_host }}:{{ item.port }}/sc,seLJDaKBog3LLEMDe8cjBefMhnVSibO4RA5boZhWcVZ0=/https://samuelclay.com/static/images/2019%20-%20Cuba.jpg",
|
||||
{% elif item.target_host == "node-favicons" %}
|
||||
"http": "http://{{ ansible_ssh_host }}:{{ item.port }}/rss_feeds/icon/1",
|
||||
"http": "http://{{ ansible_host }}:{{ item.port }}/rss_feeds/icon/1",
|
||||
{% elif item.target_host == "node-text" %}
|
||||
"http": "http://{{ ansible_ssh_host }}:{{ item.port }}/rss_feeds/original_text_fetcher?test=1",
|
||||
"http": "http://{{ ansible_host }}:{{ item.port }}/rss_feeds/original_text_fetcher?test=1",
|
||||
{% elif item.target_host == "node-page" %}
|
||||
"http": "http://{{ ansible_ssh_host }}:{{ item.port }}/original_page/1?test=1",
|
||||
"http": "http://{{ ansible_host }}:{{ item.port }}/original_page/1?test=1",
|
||||
{% endif %}
|
||||
"interval": "15s"
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
"checks": [
|
||||
{
|
||||
"id": "{{inventory_hostname}}-exporter-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:9187",
|
||||
"http": "http://{{ ansible_host }}:9187",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"port": 5432,
|
||||
"checks": [{
|
||||
"id": "postgres-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/postgres?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/postgres?consul=1",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}]
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
],
|
||||
"checks": [{
|
||||
"id": "prometheus-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:9090/metrics",
|
||||
"http": "http://{{ ansible_host }}:9090/metrics",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}],
|
||||
"port": 9090
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@
|
|||
"checks": [
|
||||
{
|
||||
"id": "{{ item.redis_target }}-exporter-ping",
|
||||
"http": "http://{{ ansible_ssh_host }}:{{ item.port }}",
|
||||
"http": "http://{{ ansible_host }}:{{ item.port }}",
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,15 +13,15 @@
|
|||
"checks": [{
|
||||
"id": "{{inventory_hostname}}-ping",
|
||||
{% if inventory_hostname.startswith('db-redis-story') %}
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/redis_story?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/redis_story?consul=1",
|
||||
{% elif inventory_hostname.startswith('db-redis-user') %}
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/redis_user?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/redis_user?consul=1",
|
||||
{% elif inventory_hostname.startswith('db-redis-pubsub') %}
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/redis_pubsub?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/redis_pubsub?consul=1",
|
||||
{% elif inventory_hostname.startswith('db-redis-sessions') %}
|
||||
"http": "http://{{ ansible_ssh_host }}:5579/db_check/redis_sessions?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5579/db_check/redis_sessions?consul=1",
|
||||
{% else %}
|
||||
"http": "http://{{ ansible_ssh_host }}:5000/db_check/redis?consul=1",
|
||||
"http": "http://{{ ansible_host }}:5000/db_check/redis?consul=1",
|
||||
{% endif %}
|
||||
"interval": "15s",
|
||||
"failures_before_critical": 4
|
||||
|
|
|
|||
|
|
@ -1159,7 +1159,7 @@ def starred_stories_rss_feed_tag(request, user_id, secret_token, tag_slug):
|
|||
|
||||
def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
|
||||
domain = Site.objects.get_current().domain
|
||||
|
||||
date_hack_2023 = (datetime.datetime.now() > datetime.datetime(2023, 7, 1))
|
||||
try:
|
||||
user = User.objects.get(pk=user_id)
|
||||
except User.DoesNotExist:
|
||||
|
|
@ -1169,7 +1169,7 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
|
|||
feed_ids, folder_title = user_sub_folders.feed_ids_under_folder_slug(folder_slug)
|
||||
|
||||
usersubs = UserSubscription.subs_for_feeds(user.pk, feed_ids=feed_ids)
|
||||
if feed_ids and user.profile.is_archive:
|
||||
if feed_ids and ((user.profile.is_archive and date_hack_2023) or (not date_hack_2023)):
|
||||
params = {
|
||||
"user_id": user.pk,
|
||||
"feed_ids": feed_ids,
|
||||
|
|
@ -1268,7 +1268,7 @@ def folder_rss_feed(request, user_id, secret_token, unread_filter, folder_slug):
|
|||
rss.add_item(**story_data)
|
||||
|
||||
# TODO: Remove below date hack to accomodate users who paid for premium but want folder rss
|
||||
if not user.profile.is_archive and (datetime.datetime.now() > datetime.datetime(2023, 7, 1)):
|
||||
if not user.profile.is_archive and date_hack_2023:
|
||||
story_data = {
|
||||
'title': "You must have a premium archive subscription on NewsBlur to have RSS feeds for folders.",
|
||||
'link': "https://%s/?next=premium" % domain,
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
UIView *urlPadding = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 24, 16)];
|
||||
UIImageView *urlImage = [[UIImageView alloc]
|
||||
initWithImage:[UIImage imageNamed:@"world.png"]];
|
||||
initWithImage:[Utilities imageNamed:@"world" sized:16]];
|
||||
urlImage.frame = CGRectMake(0, 0, 24, 16);
|
||||
[urlImage setContentMode:UIViewContentModeRight];
|
||||
[urlPadding addSubview:urlImage];
|
||||
|
|
@ -425,7 +425,7 @@
|
|||
NSData *imageData = [[NSData alloc] initWithBase64EncodedString:favicon options:NSDataBase64DecodingIgnoreUnknownCharacters];
|
||||
faviconImage = [UIImage imageWithData:imageData];
|
||||
} else {
|
||||
faviconImage = [UIImage imageNamed:@"world.png"];
|
||||
faviconImage = [Utilities imageNamed:@"world" sized:16];
|
||||
}
|
||||
|
||||
cell.feedTitle.text = [result objectForKey:@"label"];
|
||||
|
|
|
|||
|
|
@ -675,7 +675,7 @@ static NSArray<NSString *> *NewsBlurTopSectionNames;
|
|||
activityButton.accessibilityLabel = @"Activities";
|
||||
[activityButton setImage:activityImage forState:UIControlStateNormal];
|
||||
activityButton.tintColor = UIColorFromRGB(0x8F918B);
|
||||
[activityButton setImageEdgeInsets:UIEdgeInsetsMake(4, 4, 4, 4)];
|
||||
[activityButton setImageEdgeInsets:UIEdgeInsetsMake(4, 12, 4, -12)];
|
||||
[activityButton addTarget:self
|
||||
action:@selector(showInteractionsPopover:)
|
||||
forControlEvents:UIControlEventTouchUpInside];
|
||||
|
|
@ -2643,7 +2643,7 @@ heightForHeaderInSection:(NSInteger)section {
|
|||
typeof(self) __weak weakSelf = self;
|
||||
[avatarImageView setImageWithURLRequest:avatarRequest placeholderImage:nil success:^(NSURLRequest *request, NSHTTPURLResponse *response, UIImage *image) {
|
||||
typeof(weakSelf) __strong strongSelf = weakSelf;
|
||||
image = [Utilities roundCorneredImage:image radius:6 convertToSize:CGSizeMake(32, 32)];
|
||||
image = [Utilities roundCorneredImage:image radius:6 convertToSize:CGSizeMake(40, 40)];
|
||||
image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
|
||||
[(UIButton *)strongSelf.userAvatarButton setImage:image forState:UIControlStateNormal];
|
||||
|
||||
|
|
@ -2653,7 +2653,7 @@ heightForHeaderInSection:(NSInteger)section {
|
|||
|
||||
[userInfoView addSubview:userAvatarButton];
|
||||
|
||||
userLabel = [[UILabel alloc] initWithFrame:CGRectMake(48, yOffset, userInfoView.frame.size.width, 16)];
|
||||
userLabel = [[UILabel alloc] initWithFrame:CGRectMake(54, yOffset, userInfoView.frame.size.width, 16)];
|
||||
userLabel.text = appDelegate.activeUsername;
|
||||
userLabel.font = userLabelFont;
|
||||
userLabel.textColor = UIColorFromRGB(0x404040);
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@
|
|||
allowLongPress = YES;
|
||||
}
|
||||
|
||||
folderImage = [folderImage imageWithTintColor:UIColorFromRGB(0x95968F)];
|
||||
folderImage = [folderImage imageWithTintColor:UIColorFromLightDarkRGB(0x95968F, 0x95968F)];
|
||||
|
||||
[folderImage drawInRect:CGRectMake(rect.origin.x + folderImageViewX, CGRectGetMidY(rect)-height/2, width, height)];
|
||||
|
||||
|
|
|
|||
|
|
@ -268,9 +268,9 @@
|
|||
|
||||
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
|
||||
if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
|
||||
return 13;
|
||||
} else {
|
||||
return 12;
|
||||
} else {
|
||||
return 11;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -280,17 +280,17 @@
|
|||
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIndentifier];
|
||||
NSUInteger iPadOffset = [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone ? 0 : 1;
|
||||
|
||||
if (indexPath.row == 7) {
|
||||
if (indexPath.row == 6) {
|
||||
return [self makeFontSizeTableCell];
|
||||
} else if (indexPath.row == 8) {
|
||||
} else if (indexPath.row == 7) {
|
||||
return [self makeLineSpacingTableCell];
|
||||
} else if (indexPath.row == 9 && iPadOffset == 0) {
|
||||
} else if (indexPath.row == 8 && iPadOffset == 0) {
|
||||
return [self makeFullScreenTableCell];
|
||||
} else if (indexPath.row == 10 - iPadOffset) {
|
||||
} else if (indexPath.row == 9 - iPadOffset) {
|
||||
return [self makeAutoscrollTableCell];
|
||||
} else if (indexPath.row == 11 - iPadOffset) {
|
||||
} else if (indexPath.row == 10 - iPadOffset) {
|
||||
return [self makeScrollOrientationTableCell];
|
||||
} else if (indexPath.row == 12 - iPadOffset) {
|
||||
} else if (indexPath.row == 11 - iPadOffset) {
|
||||
return [self makeThemeTableCell];
|
||||
}
|
||||
|
||||
|
|
@ -338,9 +338,6 @@
|
|||
cell.imageView.image = [Utilities templateImageNamed:@"share" sized:20];
|
||||
cell.imageView.tintColor = UIColorFromRGB(0x94968E);
|
||||
} else if (indexPath.row == 5) {
|
||||
cell.textLabel.text = @"Delete this site";
|
||||
cell.imageView.image = [UIImage imageNamed:@"menu_icn_delete.png"];
|
||||
} else if (indexPath.row == 6) {
|
||||
NSString *fontStyle = [[NSUserDefaults standardUserDefaults] stringForKey:@"fontStyle"];
|
||||
if (!fontStyle) {
|
||||
fontStyle = @"GothamNarrow-Book";
|
||||
|
|
@ -366,14 +363,14 @@
|
|||
}
|
||||
|
||||
- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
if (indexPath.row >= 7) {
|
||||
if (indexPath.row >= 6) {
|
||||
return nil;
|
||||
}
|
||||
return indexPath;
|
||||
}
|
||||
|
||||
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
|
||||
if (indexPath.row != 5 && indexPath.row != 6) {
|
||||
if (indexPath.row != 5) {
|
||||
[self dismissViewControllerAnimated:indexPath.row != 3 && indexPath.row != 4 completion:nil];
|
||||
}
|
||||
|
||||
|
|
@ -392,34 +389,8 @@
|
|||
} else if (indexPath.row == 4) {
|
||||
[self.appDelegate.storyPagesViewController.currentPage openShareDialog];
|
||||
} else if (indexPath.row == 5) {
|
||||
[self confirmDeleteSite:self.navigationController];
|
||||
} else if (indexPath.row == 6) {
|
||||
[self showFontList];
|
||||
}
|
||||
|
||||
|
||||
// if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
|
||||
// if (indexPath.row != 2 && indexPath.row != 3) {
|
||||
// // if we're opening another popover, then don't animate out - it looks strange
|
||||
// [self.appDelegate.masterContainerViewController hidePopover];
|
||||
// }
|
||||
// } else {
|
||||
// [self.appDelegate.storyPagesViewController.popoverController dismissPopoverAnimated:YES];
|
||||
// self.appDelegate.storyPagesViewController.popoverController = nil;
|
||||
// }
|
||||
//
|
||||
// [tableView deselectRowAtIndexPath:indexPath animated:YES];
|
||||
}
|
||||
|
||||
- (void)confirmDeleteSite:(UINavigationController *)menuNavigationController {
|
||||
MenuViewController *controller = [MenuViewController new];
|
||||
controller.title = @"Positive?";
|
||||
|
||||
[controller addTitle:@"Delete this site" iconName:@"menu_icn_delete.png" destructive:YES selectionShouldDismiss:YES handler:^{
|
||||
[self deleteSite];
|
||||
}];
|
||||
|
||||
[self.navigationController showViewController:controller sender:self];
|
||||
}
|
||||
|
||||
- (void)deleteSite {
|
||||
|
|
|
|||
|
|
@ -190,6 +190,10 @@ NSString * const ThemeStyleDark = @"dark";
|
|||
} else if ([theme isEqualToString:ThemeStyleMedium]) {
|
||||
if (rgbValue == 0x8F918B) {
|
||||
return [UIColor colorWithWhite:0.7 alpha:1.0];
|
||||
} else if (rgbValue == NEWSBLUR_LINK_COLOR) {
|
||||
return [UIColor colorWithRed:1.0 - red green:1.0 - green blue:1.0 - blue alpha:1.0];
|
||||
} else if (rgbValue == 0x999999) {
|
||||
return [UIColor colorWithWhite:0.6 alpha:1.0];
|
||||
} else if (red < 0.5 && green < 0.5 && blue < 0.5) {
|
||||
return [UIColor colorWithRed:1.2 - red green:1.2 - green blue:1.2 - blue alpha:1.0];
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<objects>
|
||||
<viewController storyboardIdentifier="DetailViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="djW-7k-haK" customClass="DetailViewController" customModule="NewsBlur" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jTZ-4O-xyT">
|
||||
<rect key="frame" x="0.0" y="0.0" width="1194" height="834"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="818.5" height="834"/>
|
||||
<subviews>
|
||||
<containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bPa-u1-Aml">
|
||||
<rect key="frame" x="0.0" y="74" width="1194" height="580"/>
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ frontend public
|
|||
|
||||
use_backend app_push if { hdr_end(host) -i push.newsblur.com }
|
||||
use_backend node_socket if { path_beg /v3/socket.io/ }
|
||||
use_backend node_favicon if { path_beg /rss_feeds/icon/ }
|
||||
use_backend node_favicons if { path_beg /rss_feeds/icon/ }
|
||||
use_backend node_text if { path_beg /rss_feeds/original_text_fetcher }
|
||||
use_backend node_images if { hdr_end(host) -i imageproxy.newsblur.com }
|
||||
use_backend node_images if { hdr_end(host) -i imageproxy2.newsblur.com }
|
||||
|
|
@ -174,7 +174,7 @@ backend node_socket
|
|||
server {{host}} {{host}}.node.nyc1.consul:8008
|
||||
{% endfor %}
|
||||
|
||||
backend node_favicon
|
||||
backend node_favicons
|
||||
http-check expect rstatus 200|503
|
||||
option httpchk GET /rss_feeds/icon/1
|
||||
balance roundrobin
|
||||
|
|
@ -184,7 +184,10 @@ backend node_text
|
|||
http-check expect rstatus 200|503
|
||||
option httpchk GET /rss_feeds/original_text_fetcher?test=1
|
||||
balance roundrobin
|
||||
server-template node-text 1 _node-text._tcp.service.nyc1.consul:8008 check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
|
||||
default-server check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
|
||||
{% for host in groups.node_text %}
|
||||
server {{host}} {{host}}.node.nyc1.consul:8008
|
||||
{% endfor %}
|
||||
|
||||
backend node_page
|
||||
http-check expect rstatus 200|503
|
||||
|
|
|
|||
|
|
@ -71,6 +71,6 @@ favicons = (app) =>
|
|||
if ENV_DEV or ENV_DOCKER
|
||||
res.redirect '/media/img/icons/nouns/world.svg'
|
||||
else
|
||||
res.redirect 'https://beta.newsblur.com/media/img/icons/nouns/world.svg'
|
||||
res.redirect 'https://newsblur.com/media/img/icons/nouns/world.svg'
|
||||
|
||||
exports.favicons = favicons
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
if (ENV_DEV || ENV_DOCKER) {
|
||||
return res.redirect('/media/img/icons/nouns/world.svg');
|
||||
} else {
|
||||
return res.redirect('https://beta.newsblur.com/media/img/icons/nouns/world.svg');
|
||||
return res.redirect('https://newsblur.com/media/img/icons/nouns/world.svg');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -228,8 +228,9 @@ resource "digitalocean_droplet" "discovery" {
|
|||
}
|
||||
|
||||
resource "digitalocean_droplet" "node-text" {
|
||||
count = 2
|
||||
image = var.droplet_os
|
||||
name = "node-text"
|
||||
name = contains([0], count.index) ? "node-text" : "node-text${count.index+1}"
|
||||
region = var.droplet_region
|
||||
size = var.droplet_size
|
||||
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
|
||||
|
|
@ -263,8 +264,9 @@ resource "digitalocean_droplet" "node-socket" {
|
|||
}
|
||||
|
||||
resource "digitalocean_droplet" "node-favicons" {
|
||||
count = 2
|
||||
image = var.droplet_os
|
||||
name = "node-favicons"
|
||||
name = "node-favicons${count.index+1}"
|
||||
region = var.droplet_region
|
||||
size = var.droplet_size
|
||||
ssh_keys = [digitalocean_ssh_key.default.fingerprint]
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ variable "droplet_os" {
|
|||
|
||||
variable "sentry_droplet_size" {
|
||||
type = string
|
||||
default = "s-4vcpu-8gb"
|
||||
default = "s-8vcpu-16gb"
|
||||
}
|
||||
|
||||
variable "metrics_droplet_size" {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue