2 files changed, 0 insertions, 103 deletions
diff --git a/modules/pacman b/modules/pacman
new file mode 160000
+Subproject 1b42bd156fd35c7736e155e3a8c456969a274ff
diff --git a/modules/pacman/templates/pacman.conf.main.erb b/modules/pacman/templates/pacman.conf.main.erb
deleted file mode 100644
index 2c2df5b..0000000
--- a/modules/pacman/templates/pacman.conf.main.erb
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-RootDir      = <%= @rootdir %>
-#DBPath      = /var/lib/pacman/
-DBPath       = <%= @dbpath %>
-#CacheDir    = /var/cache/pacman/pkg/
-CacheDir     = <%= @cachedir %>
-#LogFile     = /var/log/pacman.log
-LogFile      = <%= @logfile %>
-#GPGDir      = /etc/pacman.d/gnupg/
-GPGDir       = <%= @gpgdir %>
-#HoldPkg     = pacman glibc
-HoldPkg      = <%= @holdpkg %>
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-XferCommand  = <%= @xfercommand %>
-#CleanMethod = KeepInstalled
-CleanMethod  = <%= @cleanmethod %>
-#UseDelta    = 0.7
-UseDelta     = <%= @usedelta %>
-#Architecture = auto
-Architecture  = <%= @architecture %>
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg     = <%= @ignorepkg %> 
-IgnoreGroup  = <%= @ignoregroup %>
-NoUpgrade    = <%= @noupgrade %>
-NoExtract    = <%= @noextract %>
-# Misc options
-#UseSyslog
-<% if @usesyslog -%>
-UseSyslog
-<% end -%>
-#color
-<% if @color -%>
-Color
-<% end -%>
-#TotalDownload
-<% if @totaldownload -%>
-TotalDownload
-<% end -%>
-#CheckSpace
-<% if @checkspace -%>
-CheckSpace
-<% end -%>
-#VerbosePkgLists
-<% if @verbosepkglist -%>
-VerbosePkgLists
-<% end -%>
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = <%= @mainsiglevel %>
-LocalFileSigLevel = <%= @localfilesiglevel %> 
-RemoteFileSigLevel = <%= @remotefilesiglevel %>
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.

diff --git a/modules/pacman b/modules/pacman new file mode 160000
		Subproject 1b42bd156fd35c7736e155e3a8c456969a274ff


diff --git a/modules/pacman/templates/pacman.conf.main.erb b/modules/pacman/templates/pacman.conf.main.erb deleted file mode 100644 index 2c2df5b..0000000 --- a/modules/pacman/templates/pacman.conf.main.erb +++ /dev/null
@@ -1,103 +0,0 @@
1	#
2	# /etc/pacman.conf
3	#
4	# See the pacman.conf(5) manpage for option and repository directives
5
6	#
7	# GENERAL OPTIONS
8	#
9	[options]
10	# The following paths are commented out with their default values listed.
11	# If you wish to use different paths, uncomment and update the paths.
12	#RootDir = /
13	RootDir = <%= @rootdir %>
14
15	#DBPath = /var/lib/pacman/
16	DBPath = <%= @dbpath %>
17
18	#CacheDir = /var/cache/pacman/pkg/
19	CacheDir = <%= @cachedir %>
20
21	#LogFile = /var/log/pacman.log
22	LogFile = <%= @logfile %>
23
24	#GPGDir = /etc/pacman.d/gnupg/
25	GPGDir = <%= @gpgdir %>
26
27	#HoldPkg = pacman glibc
28	HoldPkg = <%= @holdpkg %>
29
30	#XferCommand = /usr/bin/curl -C - -f %u > %o
31	#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
32	XferCommand = <%= @xfercommand %>
33
34	#CleanMethod = KeepInstalled
35	CleanMethod = <%= @cleanmethod %>
36
37	#UseDelta = 0.7
38	UseDelta = <%= @usedelta %>
39
40	#Architecture = auto
41	Architecture = <%= @architecture %>
42
43	# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
44	IgnorePkg = <%= @ignorepkg %>
45	IgnoreGroup = <%= @ignoregroup %>
46
47	NoUpgrade = <%= @noupgrade %>
48	NoExtract = <%= @noextract %>
49
50	# Misc options
51	#UseSyslog
52	<% if @usesyslog -%>
53	UseSyslog
54	<% end -%>
55	#color
56	<% if @color -%>
57	Color
58	<% end -%>
59	#TotalDownload
60	<% if @totaldownload -%>
61	TotalDownload
62	<% end -%>
63	#CheckSpace
64	<% if @checkspace -%>
65	CheckSpace
66	<% end -%>
67	#VerbosePkgLists
68	<% if @verbosepkglist -%>
69	VerbosePkgLists
70	<% end -%>
71
72	# By default, pacman accepts packages signed by keys that its local keyring
73	# trusts (see pacman-key and its man page), as well as unsigned packages.
74	SigLevel = <%= @mainsiglevel %>
75	LocalFileSigLevel = <%= @localfilesiglevel %>
76	RemoteFileSigLevel = <%= @remotefilesiglevel %>
77
78	# NOTE: You must run `pacman-key --init` before first using pacman; the local
79	# keyring can then be populated with the keys of all official Arch Linux
80	# packagers with `pacman-key --populate archlinux`.
81
82	#
83	# REPOSITORIES
84	# - can be defined here or included from another file
85	# - pacman will search repositories in the order defined here
86	# - local/custom mirrors can be added here or in separate files
87	# - repositories listed first will take precedence when packages
88	# have identical names, regardless of version number
89	# - URLs will have $repo replaced by the name of the current repo
90	# - URLs will have $arch replaced by the name of the architecture
91	#
92	# Repository entries are of the format:
93	# [repo-name]
94	# Server = ServerName
95	# Include = IncludePath
96	#
97	# The header [repo-name] is crucial - it must be present and
98	# uncommented to enable the repo.
99	#
100
101	# The testing repositories are disabled by default. To enable, uncomment the
102	# repo name header and Include lines. You can add preferred servers immediately
103	# after the header, and they will be used before the default mirrors.