Browse Source

ensure we can install from third-party repos across playbooks

Alex Payne 10 years ago
parent
commit
34d7595c0b
2 changed files with 3 additions and 4 deletions
  1. 2
    0
      roles/common/tasks/main.yml
  2. 1
    4
      roles/owncloud/tasks/owncloud.yml

+ 2
- 0
roles/common/tasks/main.yml View File

@@ -25,6 +25,8 @@
25 25
     - apticron
26 26
     - update-notifier-common
27 27
     - debian-goodies
28
+    - apt-transport-https
29
+    - python-software-properties
28 30
 
29 31
 - name: Install ntp
30 32
   apt: pkg=ntp state=installed

+ 1
- 4
roles/owncloud/tasks/owncloud.yml View File

@@ -8,9 +8,6 @@
8 8
 - name: Create database for ownCloud
9 9
   mysql_db: name={{ owncloud_mysql_database }} state=present
10 10
 
11
-- name: Install ownCloud dependencies
12
-  apt: pkg=python-software-properties
13
-
14 11
 - name: Ensure repository key for ownCloud is in place
15 12
   apt_key: url=http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key state=present
16 13
 
@@ -27,7 +24,7 @@
27 24
 - name: Enable Apache rewrite module
28 25
   command: a2enmod rewrite creates=/etc/apache2/mods-enabled/rewrite.load
29 26
   notify: restart apache
30
-  
27
+
31 28
 - name: Enable Apache headers module
32 29
   command: a2enmod headers creates=/etc/apache2/mods-enabled/headers.load
33 30
   notify: restart apache

Loading…
Cancel
Save