remove license from apache-mirror-selector.py. Simplify node install

This commit is contained in:
Jeff Steinmetz 2015-11-25 21:47:21 -08:00
parent a86c55fb73
commit 0b169a6d7c
3 changed files with 1 additions and 23 deletions

View file

@ -1,20 +1,5 @@
#! /usr/bin/env python
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import sys, argparse
from urllib2 import urlopen
from json import loads

View file

@ -15,16 +15,11 @@
# Install Node.js via NodeSource
---
- name: Ensure the system can use the HTTPS transport for APT
stat:
path: /usr/lib/apt/methods/https
register: apt_https_transport
- name: Install HTTPS transport for APT
apt:
pkg: apt-transport-https
state: installed
when: not apt_https_transport.stat.exists
- name: Import the NodeSource GPG key into apt
apt_key:
@ -43,7 +38,7 @@
- name: Add NodeSource repository preferences
template:
src: etc/apt/preferences.d/deb_nodesource_com_node.pref.2
src: deb_nodesource_com_node.pref.2
dest: /etc/apt/preferences.d/deb_nodesource_com_node.pref
- name: Install Node.js

View file

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# {{ ansible_managed }}
Package: *
Pin: release o=Node Source
Pin-Priority: {{ nodejs_nodesource_pin_priority }}