dev

lzap · Jul 30, 2013 · 1cff629 · 1cff629
1 parent dbdd5d5
commit 1cff629
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/apps/example.yaml b/apps/example.yaml
@@ -12,8 +12,9 @@ disable_root: 0
 ssh_authorized_keys:
   - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8w6DONv1qn3IdgxSpkYOClq7oe7davWFqKVHPbLoS6+dFInru7gdEO5byhTih6+PwRhHv/b1I+Mtt5MDZ8Sv7XFYpX/3P/u5zQiy1PkMSFSz0brRRUfEQxhXLW97FJa7l+bej2HJDt7f9Gvcj+d/fNWC9Z58/GX11kWk4SIXaKotkN+kWn54xGGS7Zvtm86fP59Srt6wlklSsG8mZBF7jVUjyhAgm/V5gDFb2/6jfiwSb2HyJ9/NbhLkWNdwrvpdGZqQlYhnwTfEZdpwizW/Mj3MxP5O31HN45aE0wog0UeWY4gvTl4Ogb6kescizAM6pCff3RBslbFxLdOO7cR17 [email protected]"
 
-packages:
-  - "mlocate"
+# packages does not work on Fedora 19 cloud image
+# packages:
+  #- mlocate
   #- openssh-clients
   #- acpid
   #- ntp
@@ -87,8 +88,9 @@ write_files:
       alias auditlast="grep AVC /var/log/audit/audit.log | audit2allow -R"
 
 runcmd:
-  - "sed -i 's/^PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config"
-  - "echo dog8code | passwd --stdin"
+  - "/usr/bin/yum -y install mlocate openssh-clients acpid ntp vim screen wget curl telnet rsync mc git setools-console policycoreutils-devel"
+  - "/usr/bin/sed -i 's/^PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config"
+  - "echo dog8code | /usr/bin/passwd --stdin"
   - "/usr/bin/updatedb"
   - "/usr/bin/sepolgen-ifgen"
 

diff --git a/apps/foreman/dev b/apps/foreman/dev
@@ -3,12 +3,7 @@
 # Installs Foreman nightly using snap-guest
 
 # needed for YUM/RPM scriplets to work correctly
-PATH=$PATH:/usr/bin:/usr/sbin:/bin:/sbin
-
-# WORKAROUNDS
-# F19
-cp /usr/lib/systemd/system/puppetagent.service /etc/systemd/system/puppet.service
-# /WORKAROUNDS
+export PATH=$PATH:/usr/bin:/usr/sbin:/bin:/sbin
 
 [ -f /etc/redhat-release ] && OSNV=el$(rpm -q --queryformat '%{VERSION}' redhat-release-server)
 [ -f /etc/fedora-release ] && OSNV=f$(rpm -q --queryformat '%{VERSION}' fedora-release)
@@ -19,6 +14,11 @@ service iptables stop
 rpm -q foreman-release && yum -y install http://yum.theforeman.org/nightly/$OSNV/x86_64/foreman-release.rpm
 rpm -q foreman-installer && yum -y install ruby puppet foreman-installer
 
+# WORKAROUNDS
+# F19
+cp /usr/lib/systemd/system/puppetagent.service /etc/systemd/system/puppet.service
+# /WORKAROUNDS
+
 mkdir /etc/foreman-installer 2>/dev/null
 cat >/etc/foreman-installer/answers.yaml <<EOF
 foreman: