diff options
78 files changed, 3206 insertions, 107 deletions
@@ -7,3 +7,5 @@ data/config.php data/config.testing.php data/config.testing-tmp.php cache +sql/dumps +www/.htpasswd diff --git a/README.md b/README.md new file mode 100644 index 0000000..8d5f588 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# SemanticScuttle + +SemanticScuttle is a social bookmarking tool experimenting with new features like structured tags and collaborative descriptions of tags. Originally a fork of Scuttle, it has overtaken its ancestor in stability, features and usability. + +## Features + * LDAP/Active Directory authentication + * RSS feed support: global feed, user feeds, per-tag feeds, private feeds + * Public and private bookmarks + * Delicious and Browser bookmark import + * Theming support + * Firefox plugin + +## Origin + + * https://sourceforge.net/projects/semanticscuttle/ + * https://github.com/cweiske/SemanticScuttle diff --git a/README.rst b/README.rst new file mode 120000 index 0000000..2ad76b7 --- /dev/null +++ b/README.rst @@ -0,0 +1 @@ +doc/README.rst
\ No newline at end of file diff --git a/cache/.gitignore b/cache/.gitignore new file mode 100644 index 0000000..f05fcdc --- /dev/null +++ b/cache/.gitignore @@ -0,0 +1 @@ +*.cache
\ No newline at end of file diff --git a/cache/.htaccess b/cache/.htaccess index baa56e5..b66e808 100644 --- a/cache/.htaccess +++ b/cache/.htaccess @@ -1,2 +1 @@ -order allow,deny -deny from all
\ No newline at end of file +Require all denied diff --git a/data/config.default.php b/data/config.default.php index 95df176..73b098b 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -115,7 +115,7 @@ $usecache = false; * * @var string */ -$dir_cache = dirname(__FILE__) . '/cache/'; +$dir_cache = dirname(__DIR__, 1) . '/cache'; /** * Use clean urls without .php filenames. @@ -149,14 +149,14 @@ $debugMode = false; * * @var string */ -$dbtype = 'mysql4'; +$dbtype = 'mysqli'; /** * Database hostname/IP * * @var string */ -$dbhost = '127.0.0.1'; +$dbhost = 'localhost'; /** * Database port. @@ -796,4 +796,10 @@ $allowUnittestMode = false; */ $cacheUrl = null; +/** + * bookmark-bot email address mapping + * Input address as key, user email as target + */ +$botMailMap = array(); + ?> diff --git a/data/config.php.dist b/data/config.php.dist index 5f49857..61eb7af 100644 --- a/data/config.php.dist +++ b/data/config.php.dist @@ -46,7 +46,7 @@ $cleanurls = false; * * @var boolean */ -$debugMode = true; +$debugMode = false; /*************************************************** @@ -62,7 +62,7 @@ $debugMode = true; * * @var string */ -$dbtype = 'mysql4'; +$dbtype = 'mysqli'; /** * Database username * @@ -89,7 +89,7 @@ $dbname = 'scuttle'; * * @var string */ -$dbhost = '127.0.0.1'; +$dbhost = 'localhost'; /*************************************************** diff --git a/data/schema/7.sql b/data/schema/7.sql new file mode 100644 index 0000000..28694fa --- /dev/null +++ b/data/schema/7.sql @@ -0,0 +1 @@ +CREATE INDEX sc_bookmarks2tags_index ON sc_bookmarks2tags(tag); diff --git a/data/tables.sql b/data/tables.sql index 68d5ba9..86779c2 100644 --- a/data/tables.sql +++ b/data/tables.sql @@ -5,6 +5,9 @@ -- Table structure for table `sc_bookmarks` -- +# to avoid STRICT_TRANS_TABLES mode +SET sql_mode = ''; + CREATE TABLE `sc_bookmarks` ( `bId` int(11) NOT NULL auto_increment, `uId` int(11) NOT NULL default '0', @@ -17,8 +20,8 @@ CREATE TABLE `sc_bookmarks` ( `bDescription` text default NULL, `bPrivateNote` text default NULL, `bHash` varchar(32) NOT NULL default '', - `bVotes` int(11) NOT NULL, - `bVoting` int(11) NOT NULL, + `bVotes` int(11) NOT NULL default '0', + `bVoting` int(11) NOT NULL default '0', `bShort` varchar(16) default NULL, PRIMARY KEY (`bId`), KEY `sc_bookmarks_usd` (`uId`,`bStatus`,`bDatetime`), @@ -56,6 +59,8 @@ CREATE TABLE `sc_bookmarks2tags` ( KEY `sc_bookmarks2tags_bId` (`bId`) ) CHARACTER SET utf8 COLLATE utf8_general_ci ; +CREATE INDEX sc_bookmarks2tags_index ON sc_bookmarks2tags(tag); + -- -------------------------------------------------------- -- diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php index 818eea0..20b5336 100644 --- a/data/templates/default/bookmarks.tpl.php +++ b/data/templates/default/bookmarks.tpl.php @@ -112,6 +112,7 @@ if($userservice->isLoggedOn()) { window.onload = playerLoad; </script> +<?php if (count($bookmarks) > 1) { ?> <p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?> <?php $titleArrow = ''; @@ -162,6 +163,7 @@ default: <a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a> <span>/</span> <?php } ?> +<?php } ?> <?php if ($currenttag!= '') { @@ -275,6 +277,12 @@ if ($currenttag!= '') { break; } + // Add username in case bookmark was loaded using getBookmark() + if (!isset($row['username']) && isset($row['uId'])) { + $userinfo = $userservice->getObjectUser($row['uId']); + $row['username'] = $userinfo->username; + } + $cats = ''; $tagsForCopy = ''; $tags = $row['tags']; @@ -310,12 +318,13 @@ if ($currenttag!= '') { $update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>'; // User attribution - $copy = ' ' . T_('by') . ' '; if ($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username'] ) { + $copy = ' ' . T_('by') . ' '; $copy .= T_('you'); - } else { + } else if (isset($row['username'])) { + $copy = ' ' . T_('by') . ' '; $copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">' . SemanticScuttle_Model_UserArray::getName($row) . '</a>'; @@ -506,6 +515,7 @@ if ($currenttag!= '') { . $edit . "\n" . $update . "\n" . $cacheLink ."\n" + . ' | <a href="/permalink/'. $row['bId'] . '">Permalink</a>' ."\n" . " </div>\n"; echo $privateNoteField != '' ? ' <div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n" @@ -524,8 +534,10 @@ if ($currenttag!= '') { if(getPerPageCount($currentUser)>7) { echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>'; } - echo $pagesBanner; // display previous and next links pages + RSS link + if (isset($bookmarks) && count($bookmarks) > 1) { + echo $pagesBanner; // display previous and next links pages + RSS link + } } else { echo '<p class="error">'.T_('No bookmarks available').'</p>'; diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php index c2ab6d4..f731048 100644 --- a/data/templates/default/dynamictags.inc.php +++ b/data/templates/default/dynamictags.inc.php @@ -53,7 +53,7 @@ JS; $taglist = ''; foreach (array_keys($tagsCloud) as $key) { $row = $tagsCloud[$key]; - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $taglist .= '<span' . ' title="'. $row['bCount'] . ' ' . $entries . '"' . ' style="font-size:' . $row['size'] . '"' diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php index 842aa60..83ad2fb 100644 --- a/data/templates/default/sidebar.block.popular.php +++ b/data/templates/default/sidebar.block.popular.php @@ -31,7 +31,7 @@ if ($popularTags && count($popularTags) > 0) { } foreach ($popularTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php index 80ae71c..1deae27 100644 --- a/data/templates/default/sidebar.block.recent.php +++ b/data/templates/default/sidebar.block.recent.php @@ -26,7 +26,7 @@ if ($recentTags && count($recentTags) > 0) { } foreach ($recentTags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."</p>\n"; diff --git a/data/templates/default/tags.tpl.php b/data/templates/default/tags.tpl.php index d6259cc..dce5e1c 100644 --- a/data/templates/default/tags.tpl.php +++ b/data/templates/default/tags.tpl.php @@ -16,7 +16,7 @@ if ($tags && count($tags) > 0) { <?php $contents = ''; foreach ($tags as $row) { - $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); + $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']); $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; } echo $contents ."\n"; diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php index 55be4a7..79cc2e2 100644 --- a/data/templates/default/top.inc.php +++ b/data/templates/default/top.inc.php @@ -3,6 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" /> + <meta name="viewport" content="width=device-width,initial-scale=1"> <title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title> <link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>" /> <link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>" /> diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt index c911740..4aadd16 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -29,6 +29,8 @@ then this instructions are for you. $ psql mydatabasename myusername < data/tables-postgresql.sql + You can also use a web interface like phpMyAdmin to import the file. + 3. Copy ``data/config.php.dist`` to ``data/config.php`` and modify it as necessary. See configuration_ for more information. 4. Make the cache directory writable by your web server. diff --git a/kvmxfile b/kvmxfile new file mode 100644 index 0000000..ea600c3 --- /dev/null +++ b/kvmxfile @@ -0,0 +1,243 @@ +# +# Sample kvmx file - https://kvmx.fluxo.info +# + +# Hostname +hostname="links" + +# Which base box you should use. Leave unconfigured to use kvmx-create instead. +#basebox="buster" +basebox="dev" + +# First user name +user="user" + +# First user password +password="`head -c 40 /dev/urandom | base64`" + +# Networking +#net="tap" +net="user" + +# DNS config +#net_dns="192.168.1.1" +#net_dns="host" # copy /etc/resolv.conf from host when creating the box + +# Networking: tap config only +# This setting is used during virtual machine bootstrapping by kvmx-create. +#net_ip="10.1.1.2" +#net_mask="255.255.255.0" +#net_gateway="10.1.1.1" + +# Set this is you want to be able to share a single folder between host and guest. +# Needs ssh_support set to "y" and a workable SSH connection to the guest. +shared_folder="." +#shared_folder_mountpoint="/home/$user/code/$VM" +#shared_folder="$HOME/temp/shared/$VM" +#shared_folder_mountpoint="/home/$user/temp/shared/$VM" +shared_folder_mountpoint="/srv/shared" +#shared_folder_mountpoint="/srv/kvmx" +#shared_folder_mountpoint="/vagrant" + +# Set this is you want to be able to share multiple folders between host and guest using 9p. +# Needs ssh_support set to "y" and a workable SSH connection to the guest. +# Format: <id1>:<host-folder1>:<guest-mountpoint1>,<id2>:<host-folder2>:<guest-mountpoint2>[,...] +#shared_folders="shared1:.:/home/$user/code/$VM,shared2:$HOME/.local/share/app:/home/$user/.local/share/app" + +# Maximum packet size including any headers for shared folders using 9p +# See https://forums.lime-technology.com/topic/34691-9p-sharing-speed-not-what-i-expected/ +# https://github.com/clearcontainers/hyperstart/pull/25 +#shared_folders_msize="524288" + +# Shared folders caching +# See https://www.kernel.org/doc/Documentation/filesystems/9p.txt +#shared_folders_cache="none" + +# Set this is you want to be able to share multiple folders between host and guest using SSHFS. +# Needs ssh_support set to "y" and a workable SSH connection to the guest. +# Format: <id1>:<guest-folder1>:<host-mountpoint1>,<id2>:<guest-folder2>:<host-mountpoint2>[,...] +#shared_folders_sshfs="shared1:/home/$user/code/$VM:.,shared2:/home/$user/.local/share/app:$HOME/.local/share/app" + +# Folder to sync during provisioning in the format "/host/folder1 /guest/folder1,/host/folder2 /guest/folder2[,...]". +# Needs ssh_support set to "y" and a workable SSH connection to the guest. +#provision_rsync="$KVMX_BASE/share/provision/ /usr/local/share/kvmx/provision/" +provision_rsync="puppet/ /etc/puppet/" + +# Options for provision_rsync +#provision_rsync_opts="--exclude=somefolder" + +# Absolute path for a provision script located inside the guest. +# Needs ssh_support set to "y" and a workable SSH connection to the guest. +#provision_command="sudo apt-get update && sudo apt-get dist-upgrade -y && sudo apt-get autoremove -y && sudo apt-get clean" +provision_command="/usr/local/share/kvmx/provision/development && /etc/puppet/bin/provision && /etc/puppet/bin/deploy" +#provision_command="/usr/local/share/kvmx/provision/development && /etc/puppet/bin/deploy" +#provision_command="/usr/local/share/kvmx/provision/development && /home/$user/code/$VM/bin/custom-provisioner" +#provision_command="/usr/local/share/kvmx/provision/development" +#provision_command="/usr/local/share/kvmx/provision/trashman" +#provision_command="/usr/local/share/kvmx/provision/desktop-basic" + +# Startup command +#startup_command="/path/to/custom/command" +#startup_command="hydractl aperiodic-upgrade" + +# Pre-poweroff command +#poweroff_pre_command="/path/to/custom/command" + +# Rsync commands to be run on startup or poweroff, useful to keep files synced between host and guest +#startup_rsync_to_guest="data:data:/var/data,code:$HOME/code:/home/user/code" +#poweroff_rsync_from_guest="data:/var/data:data,code:/home/user/code:$HOME/code" + +# Graphics +# See https://wiki.archlinux.org/index.php/QEMU#Graphics +#graphics="-vga std -nographic -vnc :$GUEST_DISPLAY" +graphics="-vga qxl" + +# VNC Client +#vnc_client="xtightvncviewer" +#vnc_client="xvnc4viewer" +#vnc_client="xvncviewer" +#vnc_client="vncviewer" +vnc_client="virt-viewer" + +# SPICE support +spice="1" + +# Set this if you want to attach an spice client when the machine boots. +run_spice_client="0" + +# SPICE client +#spice_client="spicec" +#spice_client="virt-viewer" +spice_client="spicy" + +# Set this if you want to start an xpra session when the machine boots. +run_xpra="0" + +# Set this if you want to start an xephyr session when the machine boots. +run_xephyr="0" + +# Set this if you want kvmx to redimension the guest screen according to host's screen dimension +# Requires ssh_support and xrandr installed on both host and guest +xrandr="0" + +# Xrandr device +#xrandr_device="qxl-0" +#xrandr_device="Virtual-0" + +# Set screen resolution +#resolution="1280x785" + +# Sound +#sound="0" +#sound="ac97" + +# Set additional hostfwd mappings +#port_mapping="hostfwd=tcp:127.0.0.1:8080-:80,hostfwd=tcp:127.0.0.1:8443-:443" +port_mapping="hostfwd=tcp:127.0.0.1:8900-:80" + +# Where the guest image is stored +#image="$HOME/.local/share/kvmx/$VM/box.img" + +# Use basebox image as a backing file for overlay images +# See https://wiki.archlinux.org/index.php/QEMU#Overlay_storage_images +#backing_file="1" + +# Where datafiles are stored: just set this if you know what you're doing +#datadir="$HOME/.local/share/kvmx/$VM" + +# Drive type: use this if you want to run a Live CD/DVD/USB +#image_drive="cdrom" + +# Image type: file or device (kvmx-create only) +image_type="file" + +# Image size +size="10G" + +# Image format: raw or qcow2 +format="qcow2" + +# Image compression (qcow2 only) +qcow2_compression="1" + +# Bootstrap method: custom or vmdeboostrap +method="custom" + +# Domain +domain="example.org" + +# System arch +arch="amd64" + +# Box distribution when bootstraping a new image +version="buster" + +# Debian mirror +mirror="https://deb.debian.org/debian/" + +# Memory +memory="2048" + +# Enables remote administration using SSH. With this configuration enabled, +# kvmx will be able to administer a running virtual machine using SSH access +# inside the virtual machine. +ssh_support="y" + +# Use a custom, per-virtual-machine generated SSH keypair. If you disable this +# configuration but still want guest administration using SSH, the default +# insecure keypair will be used. +# +# Please note that this setting won't take effect if you're using a basebox. +# In that case the basebox keypair will be used if it exists, otherwise kvmx +# fallsback to the default insecure keypair. +# +# This setting is used during virtual machine bootstrapping by kvmx-create. +ssh_custom="y" + +# Use this config if you want kvmx-create to include a specif SSH pubkey +# It might be a path for an existing pubkey file or the public key itself. +# +# Make sure to have this key available when trying to SSH into the guest using kvmx +#ssh_custom_pubkey="/home/myhostuser/.ssh/id_rsa.pub" +#ssh_custom_pubkey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDVFmJ2UDn2dK3nHHAkHzt8F4AfrXTFiGa+guem92S/pztMGAUDjEZBYEW3mZ8ATyo4GoPZ92tkjmra0Fgv6ETIox+SPWbzzjhzbv2CQUTWvF6PEVwJbT1PTzaIVRiDYf+yX7e3Y8HcmkAi60Cxs5Xr3HLkqdi2jYKFofCm58R+HGnRv1WSurPnf7C7KQBSW7E1S2CafW9VFHhGCzezyThjN+n3bJjgYFzPxdTlWyfW1T7Yv61/fqfuara0kpZx1l5pblpgbCTT7WKRIhwj1x0QTo/qDQ6k52tffiCVyMGJKvires9yp5qT5Y+ldssBKDa8muRF/dh7/UCyxvcm3HTDjWG24Sr4r9JWbhkqF89UePlOw5j73qw4gzT7YQ38tzz2XI5weAL1OXM6qhCbOwfPXwYbB5xM4g62WZugtcCLan6Iy8hvoiRIJ1MU2ar73wunghQQ84oNIrEVezJsuZxwxVbe45ulnM7x4Hqeu6jmOutWFkdkAHsqd1E3zTOS1RURwi0TpnD+iWwD7FOA9c8B6AWP4i9XVW6BLi1waARrS3bVnOh3djc20fVsClfEDDXFg2KiTeQaAWfjLguyUmxysSiUC2pnibd1bEDtdfPlkA2jaE2nAn6Tw7Vp5zd8P1d1trLMx3YkRq5uQSPqnfQDKoYH5FPMlNTbMINLC56ijw== user@kvmx" + +# Bootloader (used only during bootstrapping by kvmx-create). +bootloader="grub" + +# Drive interface +#drive_interface="ide" # Needed by some systems like NetBSD and FreeBSD +#drive_interface="virtio,cache=none,index=0,format=raw" # For raw devices + +# See http://www.reactos.org/wiki/QEMU#Setting_up_network +#nic_model="ne2k_pci" + +# USB support +# +# Allowed values: +# +# 0 - No USB support +# 1 - Support for USB 1.0 +# 2 - Support for USB 1.0 and 2.0 +# 3 - Support for USB 1.0, 2.0 and 3.0 +# +#usb="0" + +# Additional qemu opts +# Example: http://www.linux-kvm.org/page/USB_Host_Device_Assigned_to_Guest +# See also: https://qemu.readthedocs.io/en/latest/system/usb.html +# https://wiki.gentoo.org/wiki/QEMU/Windows_guest +#qemu_opts="-device usb-host,hostbus=2,hostaddr=3" # Automatically attach an specific USB device +#qemu_opts="" + +# Number of CPUs +#smp="4" + +# Enviroment passed to SSH commands +#ssh_env="TERM=xterm" + +# Whether to be managed by kvmx-supervise +#supervise_manage="1" + +# VirtIO RNG parameters +# See https://wiki.qemu.org/Features/VirtIORNG +#virtio_rng="max-bytes=128,period=1000" diff --git a/puppet/.gitignore b/puppet/.gitignore new file mode 100644 index 0000000..15a8f56 --- /dev/null +++ b/puppet/.gitignore @@ -0,0 +1,3 @@ +keys +ssl +.vagrant diff --git a/puppet/.mrconfig b/puppet/.mrconfig new file mode 100644 index 0000000..06755dd --- /dev/null +++ b/puppet/.mrconfig @@ -0,0 +1,237 @@ + +[puppet/modules/apache] +checkout = git clone git://git.fluxo.info/puppet-apache.git apache + +[puppet/modules/apcupsd] +checkout = git clone git://git.fluxo.info/puppet-apcupsd.git apcupsd + +[puppet/modules/apparmor] +checkout = git clone git://git.fluxo.info/puppet-apparmor.git apparmor + +[puppet/modules/apt] +checkout = git clone git://git.fluxo.info/puppet-apt.git apt + +[puppet/modules/augeas] +checkout = git clone git://git.fluxo.info/puppet-augeas.git augeas + +[puppet/modules/autossh] +checkout = git clone git://git.fluxo.info/puppet-autossh.git autossh + +[puppet/modules/avahi] +checkout = git clone git://git.fluxo.info/puppet-avahi.git avahi + +[puppet/modules/backup] +checkout = git clone git://git.fluxo.info/puppet-backup.git backup + +[puppet/modules/backupninja] +checkout = git clone git://git.fluxo.info/puppet-backupninja.git backupninja + +[puppet/modules/bind] +checkout = git clone git://git.fluxo.info/puppet-bind.git bind + +[puppet/modules/bitcoind] +checkout = git clone git://git.fluxo.info/puppet-bitcoind.git bitcoind + +[puppet/modules/concat] +checkout = git clone git://git.fluxo.info/puppet-concat.git concat + +[puppet/modules/cron] +checkout = git clone git://git.fluxo.info/puppet-cron.git cron + +[puppet/modules/daap_server] +checkout = git clone git://git.fluxo.info/puppet-daap_server.git daap_server + +[puppet/modules/database] +checkout = git clone git://git.fluxo.info/puppet-database.git database + +[puppet/modules/dhcp] +checkout = git clone git://git.fluxo.info/puppet-dhcp.git dhcp + +[puppet/modules/domain_check] +checkout = git clone git://git.fluxo.info/puppet-domain_check.git domain_check + +[puppet/modules/drupal] +checkout = git clone git://git.fluxo.info/puppet-drupal.git drupal + +[puppet/modules/dyndns] +checkout = git clone git://git.fluxo.info/puppet-dyndns.git dyndns + +[puppet/modules/ejabberd] +checkout = git clone git://git.fluxo.info/puppet-ejabberd.git ejabberd + +[puppet/modules/ekeyd] +checkout = git clone git://git.fluxo.info/puppet-ekeyd.git ekeyd + +[puppet/modules/etherpad] +checkout = git clone git://git.fluxo.info/puppet-etherpad.git etherpad + +[puppet/modules/exim] +checkout = git clone git://git.fluxo.info/puppet-exim.git exim + +[puppet/modules/firewall] +checkout = git clone git://git.fluxo.info/puppet-firewall.git firewall + +[puppet/modules/git] +checkout = git clone git://git.fluxo.info/puppet-git.git git + +[puppet/modules/hotglue] +checkout = git clone git://git.fluxo.info/puppet-hotglue.git hotglue + +[puppet/modules/hydra] +checkout = git clone git://git.fluxo.info/puppet-hydra.git hydra + +[puppet/modules/ikiwiki] +checkout = git clone git://git.fluxo.info/puppet-ikiwiki.git ikiwiki + +[puppet/modules/inetd] +checkout = git clone git://git.fluxo.info/puppet-inetd.git inetd + +[puppet/modules/infinoted] +checkout = git clone git://git.fluxo.info/puppet-infinoted.git infinoted + +[puppet/modules/inifile] +checkout = git clone git://git.fluxo.info/puppet-inifile.git inifile + +[puppet/modules/lighttpd] +checkout = git clone git://git.fluxo.info/puppet-lighttpd.git lighttpd + +[puppet/modules/lsb] +checkout = git clone git://git.fluxo.info/puppet-lsb.git lsb + +[puppet/modules/mail] +checkout = git clone git://git.fluxo.info/puppet-mail.git mail + +[puppet/modules/minidlna] +checkout = git clone git://git.fluxo.info/puppet-minidlna.git minidlna + +[puppet/modules/moin] +checkout = git clone git://git.fluxo.info/puppet-moin.git moin + +[puppet/modules/monkeysphere] +checkout = git clone git://git.fluxo.info/puppet-monkeysphere.git monkeysphere + +[puppet/modules/motion] +checkout = git clone git://git.fluxo.info/puppet-motion.git motion + +[puppet/modules/mpd] +checkout = git clone git://git.fluxo.info/puppet-mpd.git mpd + +[puppet/modules/mumble] +checkout = git clone git://git.fluxo.info/puppet-mumble.git mumble + +[puppet/modules/mysql] +checkout = git clone git://git.fluxo.info/puppet-mysql.git mysql + +[puppet/modules/nfs] +checkout = git clone git://git.fluxo.info/puppet-nfs.git nfs + +[puppet/modules/nginx] +checkout = git clone git://git.fluxo.info/puppet-nginx.git nginx + +[puppet/modules/nodo] +checkout = git clone git://git.fluxo.info/puppet-nodo.git nodo + +[puppet/modules/ntp] +checkout = git clone git://git.fluxo.info/puppet-ntp.git ntp + +[puppet/modules/onion] +checkout = git clone git://git.fluxo.info/puppet-onion.git onion + +[puppet/modules/php] +checkout = git clone git://git.fluxo.info/puppet-php.git php + +[puppet/modules/pmwiki] +checkout = git clone git://git.fluxo.info/puppet-pmwiki.git pmwiki + +[puppet/modules/postfix] +checkout = git clone git://git.fluxo.info/puppet-postfix.git postfix + +[puppet/modules/puppet] +checkout = git clone git://git.fluxo.info/puppet-puppet.git puppet + +[puppet/modules/pureftpd] +checkout = git clone git://git.fluxo.info/puppet-pureftpd.git pureftpd + +[puppet/modules/pyroscope] +checkout = git clone git://git.fluxo.info/puppet-pyroscope.git pyroscope + +[puppet/modules/qwebirc] +checkout = git clone git://git.fluxo.info/puppet-qwebirc.git qwebirc + +[puppet/modules/reprepro] +checkout = git clone git://git.fluxo.info/puppet-reprepro.git reprepro + +[puppet/modules/resolvconf] +checkout = git clone git://git.fluxo.info/puppet-resolvconf.git resolvconf + +[puppet/modules/rng-tools] +checkout = git clone git://git.fluxo.info/puppet-rng-tools.git rng-tools + +[puppet/modules/rsync] +checkout = git clone git://git.fluxo.info/puppet-rsync.git rsync + +[puppet/modules/runit] +checkout = git clone git://git.fluxo.info/puppet-runit.git runit + +[puppet/modules/samba] +checkout = git clone git://git.fluxo.info/puppet-samba.git samba + +[puppet/modules/schroot] +checkout = git clone git://git.fluxo.info/puppet-schroot.git schroot + +[puppet/modules/shorewall] +checkout = git clone git://git.fluxo.info/puppet-shorewall.git shorewall + +[puppet/modules/smartmontools] +checkout = git clone git://git.fluxo.info/puppet-smartmontools.git smartmontools + +[puppet/modules/sshd] +checkout = git clone git://git.fluxo.info/puppet-sshd.git sshd + +[puppet/modules/ssl] +checkout = git clone git://git.fluxo.info/puppet-ssl.git ssl + +[puppet/modules/stdlib] +checkout = git clone git://git.fluxo.info/puppet-stdlib.git stdlib + +[puppet/modules/supervisor] +checkout = git clone git://git.fluxo.info/puppet-supervisor.git supervisor + +[puppet/modules/supybot] +checkout = git clone git://git.fluxo.info/puppet-supybot.git supybot + +[puppet/modules/syslog-ng] +checkout = git clone git://git.fluxo.info/puppet-syslog-ng.git syslog-ng + +[puppet/modules/tftp] +checkout = git clone git://git.fluxo.info/puppet-tftp.git tftp + +[puppet/modules/tor] +checkout = git clone git://git.fluxo.info/puppet-tor.git tor + +[puppet/modules/trac] +checkout = git clone git://git.fluxo.info/puppet-trac.git trac + +[puppet/modules/tunnel] +checkout = git clone git://git.fluxo.info/puppet-tunnel.git tunnel + +[puppet/modules/user] +checkout = git clone git://git.fluxo.info/puppet-user.git user + +[puppet/modules/vcsrepo] +checkout = git clone git://git.fluxo.info/puppet-vcsrepo.git vcsrepo + +[puppet/modules/viewvc] +checkout = git clone git://git.fluxo.info/puppet-viewvc.git viewvc + +[puppet/modules/virtual] +checkout = git clone git://git.fluxo.info/puppet-virtual.git virtual + +[puppet/modules/websites] +checkout = git clone git://git.fluxo.info/puppet-websites.git websites + +[puppet/modules/websvn] +checkout = git clone git://git.fluxo.info/puppet-websvn.git websvn + +[puppet/modules/wordpress] +checkout = git clone git://git.fluxo.info/puppet-wordpress.git wordpress diff --git a/puppet/LICENSE b/puppet/LICENSE new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/puppet/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. diff --git a/puppet/Makefile b/puppet/Makefile new file mode 100644 index 0000000..8d77330 --- /dev/null +++ b/puppet/Makefile @@ -0,0 +1,66 @@ +# +# Puppet Boostrap Makefile by Silvio Rhatto (rhatto at riseup.net). +# +# This Makefile is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the Free +# Software Foundation; either version 3 of the License, or any later version. +# +# This Makefile is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place - Suite 330, Boston, MA 02111-1307, USA +# + +CWD = $(shell pwd) +REPO = git://git.fluxo.info/puppet-bootstrap.git +PUPPET = FACTER_BOOTSTRAP_PATH="$(CWD)" puppet apply --confdir="$(CWD)" --modulepath=modules + +all: deps remote modules config + +deps: + bin/dependencies + +modules: + mr up + +submodules: + bin/submodules + +subtrees: + bin/subtrees + +symlinks: + bin/symlinks $(MODULES) + +copymodules: + bin/copymodules $(MODULES) + +remote: + git remote add bootstrap $(REPO) + +hiera/boostrap.yaml: + $(EDITOR) hiera/bootstrap.yaml + +puppet.conf: + mkdir -p $(HOME)/.puppet + $(PUPPET) manifests/bootstrap/configurator.pp + +config: hiera/boostrap.yaml puppet.conf + @true + +apply: + $(PUPPET) manifests/bootstrap/$(stage).pp + +clean: + rm -f auth.conf fileserver.conf puppet.conf + rm -f manifests/classes/users.pp + rm -rf ssl + rm -rf modules + git checkout modules + +post_receive: + git config receive.denyCurrentBranch ignore + cd .git/hooks && ln -sf ../../bin/post-receive diff --git a/puppet/Puppetfile b/puppet/Puppetfile new file mode 100644 index 0000000..2c556c8 --- /dev/null +++ b/puppet/Puppetfile @@ -0,0 +1,53 @@ +# Local modules +mod 'site_nodo', :local => true + +# Basic modules +mod "augeas", + :git => "https://git.fluxo.info/puppet-augeas" +mod "backup", + :git => "https://git.fluxo.info/puppet-backup" +mod "backupninja", + :git => "https://git.fluxo.info/puppet-backupninja", + :ref => "develop" +mod "concat", + :git => "https://git.fluxo.info/puppet-concat" +mod "cron", + :git => "https://git.fluxo.info/puppet-cron" +mod "domain_check", + :git => "https://git.fluxo.info/puppet-domain_check" +mod "exim", + :git => "https://git.fluxo.info/puppet-exim" +mod "lsb", + :git => "https://git.fluxo.info/puppet-lsb" +mod "nodo", + :git => "https://git.fluxo.info/puppet-nodo" +mod "rsyslog", + :git => "https://git.fluxo.info/puppet-rsyslog" +mod "shellprompt", + :git => "https://git.fluxo.info/shellprompt" +mod "sshd", + :git => "https://git.fluxo.info/puppet-sshd", + :ref => "develop" +mod "ssl", + :git => "https://git.fluxo.info/puppet-ssl" +mod "stdlib", + :git => "https://git.fluxo.info/puppet-stdlib" +mod "user", + :git => "https://git.fluxo.info/puppet-user" + +# Additional modules +mod "mysql", + :git => "https://git.fluxo.info/puppet-mysql" +mod "database", + :git => "https://git.fluxo.info/puppet-database" +mod "apache", + :git => "https://git.fluxo.info/puppet-apache" +mod "php", + :git => "https://git.fluxo.info/puppet-php" +mod "ntp", + :git => "https://git.fluxo.info/puppet-ntp" +mod "websites", + :git => "https://git.fluxo.info/puppet-websites" +mod "monkeysphere", + :git => "https://git.fluxo.info/puppet-monkeysphere", + :ref => "develop" diff --git a/puppet/README.md b/puppet/README.md new file mode 100644 index 0000000..9ab8d84 --- /dev/null +++ b/puppet/README.md @@ -0,0 +1,44 @@ +Puppet Boostrap Module +====================== + +This is a multi-purpose but very specific puppet module which can be used: + +* As the base repository for a puppet infrastructure. +* As a standalone provisioner for boxes, with Vagrant support. +* It can be optionally used together with the Hydra Suite from https://git.fluxo.info/hydra + +Setting up a new puppet repository +---------------------------------- + +You'll basically use the `bootstrap` repository as your `puppet` repository: + + git clone git://git.fluxo.info/puppet-bootstrap.git puppet + cd puppet && git tag -v # check integrity + make deps # install dependencies + make submodules # add all needed puppet modules as as git submodules + make config # basic configuration + +Using as a standalone provisioner +--------------------------------- + +This will be a `Vagrant` example: + + cd your-project + git clone git://git.fluxo.info/puppet-bootstrap.git puppet # use submodule or subtree as you please + ln -s puppet/Vagrantfile # or copy if you want to customize + ( cd puppet && make modules ) # need the mr binary to download the submodules + vagrant up web # with no arguments, all defined VMs are started + +Using subtrees or symlinks for modules +-------------------------------------- + +You might use `make subtrees` instead of `make submodules`. Also, if you already have +all the modules in a different subtree, use + + make symlinks MODULES=/path/to/puppet/modules + +Recommended puppet modules +-------------------------- + +This repository plays well with other puppet modules hosted at https://git.fluxo.info, some of them +based on https://gitlab.com/shared-puppet-modules-group. diff --git a/puppet/TODO.md b/puppet/TODO.md new file mode 100644 index 0000000..650dcf9 --- /dev/null +++ b/puppet/TODO.md @@ -0,0 +1,9 @@ +TODO +==== + +* fix r10k module update issue: + * "r10k puppetfile install" fails to update some modules + https://github.com/puppetlabs/r10k/issues/767 + + * (RK-264) Add --update_force flag to puppetfile install + https://github.com/puppetlabs/r10k/pull/772 diff --git a/puppet/Vagrantfile b/puppet/Vagrantfile new file mode 100644 index 0000000..b5cd7f6 --- /dev/null +++ b/puppet/Vagrantfile @@ -0,0 +1,29 @@ +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "jessie" + + # Hostname + config.vm.hostname = "box.example.org" + + # Shell provisioner to setup basic environment. + config.vm.provision :shell, :inline => "/vagrant/puppet/bin/provision" + + # Enable provisioning with Puppet stand alone. + config.vm.provision :puppet do |puppet| + puppet.manifest_file = "bootstrap/vagrant.pp" + puppet.manifests_path = "puppet/manifests" + puppet.module_path = "puppet/modules" + puppet.hiera_config_path = "puppet/hiera.yaml" + puppet.temp_dir = "/etc/puppet" + puppet.working_directory = "/etc/puppet" + end + + # Share hiera configuration. + config.vm.synced_folder "puppet/config", "/etc/puppet/config" + + # Forwarded ports + #config.vm.network "forwarded_port", guest: 80, host: 8081 +end diff --git a/puppet/bin/copymodules b/puppet/bin/copymodules new file mode 100755 index 0000000..ab5b405 --- /dev/null +++ b/puppet/bin/copymodules @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Setup symlinks. +# + +# Parameters +BASENAME="`basename $0`" +MODULES="$1" + +# Check parameters +if [ -z "$MODULES" ]; then + echo "Usage: $BASENAME <submodules-folder>" + exit 1 +elif [ ! -e "$MODULES" ]; then + echo "Not found: $MODULES" +fi + +# Set puppet folder +if [ -d "puppet" ]; then + PUPPET_FOLDER="puppet" +else + PUPPET_FOLDER="." +fi + +# Add module symlinks using absolute folders +for module in `ls $MODULES`; do + if [ "$module" == "bootstrap" ]; then + continue + fi + + if echo "$module" | grep -q "^site_"; then + continue + fi + + path="`cd $MODULES/$module && pwd`" + ( cd $PUPPET_FOLDER/modules &> /dev/null && cp -r $path . ) +done diff --git a/puppet/bin/dependencies b/puppet/bin/dependencies new file mode 100755 index 0000000..3a47a8e --- /dev/null +++ b/puppet/bin/dependencies @@ -0,0 +1,45 @@ +#!/bin/bash +# +# Puppet bootstrap dependencies. +# + +# Parameters +BASENAME="`basename $0`" +DEPLOY_DEPENDENCIES="rsync puppet-common hiera-eyaml r10k" +DEVELOP_DEPENDENCIES="git mr whois hiera-eyaml" + +# Additional wheezy dependencies if not using puppet-common from wheezy-backports +#if [ "`head -c 1 /etc/debian_version`" == '7' ]; then +# DEPLOY_DEPENDENCIES="$DEPLOY_DEPENDENCIES ruby-hiera-puppet" +#fi + +# Set sudo config +if [ "`whoami`" != 'root' ]; then + SUDO="sudo" + + if ! sudo -n true; then + echo "Please set passwordless sudo." + exit 1 + fi +fi + +# Install a package, thanks to the Hydra Suite. +function provision_package { + if [ -z "$1" ]; then + return + fi + + dpkg -s $1 &> /dev/null + + if [ "$?" == "1" ]; then + echo "Installing package $1..." + DEBIAN_FRONTEND=noninteractive $SUDO apt-get install $1 -y + fi +} + +# Ensure basic packages are installed. +if [ "$BASENAME" == "dependencies" ]; then + for package in $DEVELOP_DEPENDENCIES; do + provision_package $package + done +fi diff --git a/puppet/bin/deploy b/puppet/bin/deploy new file mode 100755 index 0000000..f23bc42 --- /dev/null +++ b/puppet/bin/deploy @@ -0,0 +1,80 @@ +#!/bin/bash +# +# Deploy configuration using puppet. +# + +# Parameters +DIRNAME="`dirname $0`" +BASEDIR="$DIRNAME/.." + +# Install dependencies +source $DIRNAME/dependencies + +# Determine hostname +#if [ ! -z "$1" ]; then +# FQDN="$1" +#else +# FQDN="`cat /etc/hostname`" +#fi +#FQDN="`facter fqdn`" +FQDN="`cat /etc/hostname`" + +# Set manifest +PUPPET_MANIFEST="$BASEDIR/manifests/nodes/$FQDN.pp" +if [ ! -e "$PUPPET_MANIFEST" ]; then + PUPPET_MANIFEST="$BASEDIR/manifests/nodes/default.pp" +fi + +# Check manifest +if [ ! -e "$PUPPET_MANIFEST" ]; then + echo "No manifest found for $FQDN" + exit 1 +fi + +# Ensure additional dependencies are installed. +for package in $DEPLOY_DEPENDENCIES; do + provision_package $package +done + +# Parameters that needs dependencies installed +DIST="`facter lsbdistcodename`" + +# Apply patches +if [ -d "$BASEDIR/puppet/files/patches/$DIST" ]; then + ( + # Patches should be generated relativelly to the root folder + cd / + + # Only apply if needed + # Thanks https://unix.stackexchange.com/questions/55780/check-if-a-file-or-folder-has-been-patched-already + for patch in `ls $BASEDIR/puppet/files/patches/$DIST`; do + patch -p0 -N --dry-run --silent < $BASEDIR/puppet/files/patches/$DIST/$patch &> /dev/null + # If the patch has not been applied then the $? which is the exit status + # for last command would have a success status code = 0 + if [ "$?" == "0" ]; then + # Apply the patch + patch -p0 -N < $BASEDIR/puppet/files/patches/$DIST/$patch + fi + done + ) +fi + +# Check for Puppetfile +if [ -e "$BASEDIR/Puppetfile" ]; then + if which r10k &> /dev/null; then + ( cd $BASEDIR && $SUDO r10k puppetfile install -v ) + elif which librarian-puppet &> /dev/null; then + ( cd $BASEDIR && $SUDO librarian-puppet install ) + fi +fi + +# Setup facts +ROLE="`hydractl yaml-param nodo::role $BASEDIR/config/node/$FQDN.yaml default`" +LOCATION="`hydractl yaml-param nodo::location $BASEDIR/config/node/$FQDN.yaml default`" +$SUDO mkdir -p /etc/facter/facts.d +$SUDO echo "role=$ROLE" | $SUDO tee /etc/facter/facts.d/role.txt > /dev/null +$SUDO echo "location=$LOCATION" | $SUDO tee /etc/facter/facts.d/location.txt > /dev/null + +# Run puppet apply +PUPPET_OPTS="--confdir=$BASEDIR --modulepath=$BASEDIR/modules" +LC_ALL=C $SUDO puppet apply $PUPPET_OPTS $PUPPET_MANIFEST diff --git a/puppet/bin/mrconfig b/puppet/bin/mrconfig new file mode 100755 index 0000000..41be968 --- /dev/null +++ b/puppet/bin/mrconfig @@ -0,0 +1,28 @@ +#!/bin/bash +# +# Build a mrconfig for the needed modules. +# + +# Parameters +GIT="git.fluxo.info" +URL="https://$GIT/projects.list" +CWD="`pwd`" +WORK="`dirname $0`/.." + +# Create a new config +cd $WORK +rm -f $WORK/.mrconfig +touch $WORK/.mrconfig + +# Fetch repository list and update mrconfig +curl --stderr - $URL | grep "^puppet-" | cut -d ' ' -f 1 | sed -e 's/\.git$//' | while read module; do + folder="`echo $module | sed -e 's/^puppet-//'`" + + if [ "$folder" != "bootstrap" ]; then + echo "Processing $folder..." + mr config puppet/modules/$folder checkout="git clone https://$GIT/$module $folder" + fi +done + +# Teardown +cd $CWD diff --git a/puppet/bin/post-receive b/puppet/bin/post-receive new file mode 100755 index 0000000..e6baa07 --- /dev/null +++ b/puppet/bin/post-receive @@ -0,0 +1,17 @@ +#!/bin/sh + +cd .. +unset GIT_DIR + +if [ -d ".git/annex" ]; then + git annex sync +else + #git reset HEAD + git checkout -f +fi + +git submodule sync --recursive +git submodule update --init --recursive + +cd - +exec git update-server-info diff --git a/puppet/bin/provision b/puppet/bin/provision new file mode 100755 index 0000000..99cb862 --- /dev/null +++ b/puppet/bin/provision @@ -0,0 +1,30 @@ +#!/bin/bash +# +# Simple shell provisioner for Vagrant instances. +# + +# Parameters +DIRNAME="`dirname $0`" + +# Load dependencies +source $DIRNAME/dependencies + +# Ensure the system is updated. +$SUDO apt-get update && DEBIAN_FRONTEND=noninteractive $SUDO apt-get dist-upgrade -y && $SUDO apt-get autoremove -y && $SUDO apt-get clean + +# Ensure additional dependencies are installed. +for package in $DEPLOY_DEPENDENCIES; do + provision_package $package +done + +# Link hiera configuration if needed. +if [ ! -h "/etc/puppet/hiera.yaml" ]; then + $SUDO rm -f /etc/puppet/hiera.yaml + $SUDO ln -s $DIRNAME/../config/hiera.yaml /etc/puppet/hiera.yaml +fi + +# Link puppet configuration if needed. +if [ ! -h "/etc/puppet/puppet.conf" ] && [ -e "$DIRNAME/../puppet.conf" ]; then + $SUDO rm -f /etc/puppet/puppet.conf + $SUDO ln -s $DIRNAME/../puppet.conf /etc/puppet/puppet.conf +fi diff --git a/puppet/bin/submodules b/puppet/bin/submodules new file mode 100755 index 0000000..960d290 --- /dev/null +++ b/puppet/bin/submodules @@ -0,0 +1,38 @@ +#!/bin/bash +# +# Setup submodules. +# + +# Parameters +DIRNAME="`dirname $0`" + +# Usage +function usage { + echo "Usage: $1 add-submodules <DIR>" + exit $2 +} + +# Set puppet folder +if [ -d "puppet" ]; then + PUPPET_FOLDER="puppet" +else + PUPPET_FOLDER="." +fi + +# Get module list +repos="`grep = $DIRNAME/../.mrconfig | cut -d = -f 2 | cut -d ' ' -f 4`" + +# Add submodules +for repo in $repos; do + module="`basename $repo .git | sed -e s/^puppet-//`" + if [ ! -d "$PUPPET_FOLDER/modules/$module" ]; then + echo "Processing puppet module $module..." + git submodule add -f $repo $PUPPET_FOLDER/modules/$module + elif [ -e "modules/$module/.git" ]; then + # The puppet module exists and is a git submodule, so update it + ( cd $PUPPET_FOLDER/modules/$module && git pull origin master ) + fi +done + +# Update all modules +git submodule update --init diff --git a/puppet/bin/subtrees b/puppet/bin/subtrees new file mode 100755 index 0000000..19211f1 --- /dev/null +++ b/puppet/bin/subtrees @@ -0,0 +1,48 @@ +#!/bin/bash +# +# Setup subtrees. +# + +# Parameters +DIRNAME="`dirname $0`" + +# Usage +function usage { + echo "Usage: $1 add-submodules <DIR>" + exit $2 +} + +# Check for git-subtree +if ! which git-subtree &> /dev/null; then + echo "fatal: please install git-subtree" + exit 1 +fi + +# Set puppet folder +if [ -d "puppet" ]; then + PUPPET_FOLDER="puppet" +else + PUPPET_FOLDER="." +fi + +# Get module list +repos="`grep = $DIRNAME/../.mrconfig | cut -d = -f 2 | cut -d ' ' -f 4`" + +# Add subtrees +for repo in $repos; do + module="`basename $repo .git | sed -e s/^puppet-//`" + if [ ! -d "$PUPPET_FOLDER/modules/$module" ]; then + echo "Processing puppet module $module..." + git remote add $module $repo + git subtree add --prefix $PUPPET_FOLDER/modules/$module $module master --squash + elif [ ! -d "modules/$module/.git" ]; then + # The puppet module exists and is a subtree, so update it + if ! git remote | grep -qe "^$module$"; then + git remote add $module $repo + fi + + # Update subtrees + git fetch $module master + git subtree pull --prefix $PUPPET_FOLDER/modules/$module $module master --squash + fi +done diff --git a/puppet/bin/symlinks b/puppet/bin/symlinks new file mode 100755 index 0000000..a2f27cf --- /dev/null +++ b/puppet/bin/symlinks @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Setup symlinks. +# + +# Parameters +BASENAME="`basename $0`" +MODULES="$1" + +# Check parameters +if [ -z "$MODULES" ]; then + echo "Usage: $BASENAME <submodules-folder>" + exit 1 +elif [ ! -e "$MODULES" ]; then + echo "Not found: $MODULES" +fi + +# Set puppet folder +if [ -d "puppet" ]; then + PUPPET_FOLDER="puppet" +else + PUPPET_FOLDER="." +fi + +# Add module symlinks using absolute folders +for module in `ls $MODULES`; do + if [ "$module" == "bootstrap" ]; then + continue + fi + + if echo "$module" | grep -q "^site_"; then + continue + fi + + path="`cd $MODULES/$module && pwd`" + ( cd $PUPPET_FOLDER/modules &> /dev/null && ln -sf $path ) +done diff --git a/puppet/bin/syncmodules b/puppet/bin/syncmodules new file mode 100755 index 0000000..1585aa4 --- /dev/null +++ b/puppet/bin/syncmodules @@ -0,0 +1,37 @@ +#!/bin/bash +# +# Setup symlinks. +# + +# Parameters +BASENAME="`basename $0`" +MODULES="$1" + +# Check parameters +if [ -z "$MODULES" ]; then + echo "Usage: $BASENAME <submodules-folder>" + exit 1 +elif [ ! -e "$MODULES" ]; then + echo "Not found: $MODULES" +fi + +# Set puppet folder +if [ -d "puppet" ]; then + PUPPET_FOLDER="puppet" +else + PUPPET_FOLDER="." +fi + +# Add module symlinks using absolute folders +for module in `ls $MODULES`; do + if [ "$module" == "bootstrap" ]; then + continue + fi + + if echo "$module" | grep -q "^site_"; then + continue + fi + + path="`cd $MODULES/$module && pwd`" + ( cd $PUPPET_FOLDER/modules &> /dev/null && rsync -av --delete $path/ $module/ ) +done diff --git a/puppet/config/common.yaml b/puppet/config/common.yaml new file mode 100644 index 0000000..936420d --- /dev/null +++ b/puppet/config/common.yaml @@ -0,0 +1,65 @@ +--- +# +# General +# +nodo::subsystem::apt::include_src : false +nodo::subsystem::apt::use_next_release : false +nodo::subsystem::monitor::use_nagios : false +nodo::subsystem::monitor::address : "%{::fqdn}" + +# +# Firewall +# +firewall::ssl_ratelimit : "s:ssl:200/sec:20" +firewall::local_net : false +firewall::local::manage_host : true +firewall::local::manage_iface : false + +# +# Mail +# +mail::sympa::subdomain : "listas" +mail::sympa::lang : "pt_BR" + +# +# Monitoring +# +nodo::munin_node::allow: '127.0.0.1:192.168.0.[0-9]*:192.168.1.[0-9]*' + +# +# Timezone and ntp +# +ntp::zone : "Brazil/East" +ntp::pool : "south-america.pool.ntp.org" +ntp::servers : + - 'a.ntp.br' + - 'b.ntp.br' + - 'c.ntp.br' + +# +# Nameservers +# +# OpenDNS +nodo::subsystem::resolver::nameservers: + - '208.67.222.222' + - '208.67.220.220' + +# +# OpenSSH +# +sshd::use_storedconfigs : false +sshd::manage_nagios : false +sshd::listen_address : [ "%{::ipaddress}", '127.0.0.1' ] +sshd::password_authentication : 'yes' +sshd::shared_ip : 'yes' +sshd::tcp_forwarding : 'yes' +sshd::x11_forwarding : 'no' +sshd::hardened : 'yes' +sshd::print_motd : 'no' +sshd::ports : [ 22 ] +sshd::use_pam : 'no' + +# +# Backup +# +backupninja::keystore: '' diff --git a/puppet/config/hiera.yaml b/puppet/config/hiera.yaml new file mode 100644 index 0000000..14e393d --- /dev/null +++ b/puppet/config/hiera.yaml @@ -0,0 +1,38 @@ +--- +version: 5 +defaults: + datadir: "config" + data_hash: "yaml_data" +hierarchy: + # + # Put in the secrets folder all sensitive information that + # wont be spread into every system if you"re using the Hydra Suite. + # + # We also recommend to leave only encrypted data in your hiera config. + # + - name: "encrypted secrets" + path: "secrets/node/%{facts.fqdn}.yaml" + lookup_key: eyaml_lookup_key + options: + # If using the pkcs7 encryptor (default) + pkcs7_private_key: "%{settings::confdir}/keys/private_key.pkcs7.pem" + pkcs7_public_key: "%{settings::confdir}/keys/public_key.pkcs7.pem" + + - name: "regular secrets" + paths: + - "secrets/role/%{facts.role}.yaml" + - "secrets/location/%{facts.location}.yaml" + - "secrets/domain/%{facts.domain}.yaml" + + # + # All other stuff goes in regular YAML files. + # + - name: "public" + paths: + - "node/%{facts.fqdn}.yaml" + - "role/%{facts.role}.yaml" + - "virtual/%{facts.virtual}.yaml" + - "location/%{facts.location}.yaml" + - "domain/%{facts.domain}.yaml" + - "compiled.yaml" + - "common.yaml" diff --git a/puppet/config/node/box.example.org.yaml b/puppet/config/node/box.example.org.yaml new file mode 100644 index 0000000..201de61 --- /dev/null +++ b/puppet/config/node/box.example.org.yaml @@ -0,0 +1,53 @@ +--- +# +# Nodo +# +nodo::role: 'web' + +# +# Classes +# +#classes: +# - 'database' +# - 'apache' + +# +# MySQL +# +# The following password is public information and therefore +# shall not be user on production. +mysql::server::rootpw: '9pRfteNbSFFyrHhackme' + +# +# Backup +# +nodo::subsystem::backup::localhost : false +nodo::subsystem::backup::encryptkey : 'none' +nodo::subsystem::backup::password : 'hackme' + +# +# Websites +# +#websites::default_db : 'dbname' +#websites::default_db::password : 'hackme' + +# +# Apache +# +#apache::default_folder : '/srv/kvmx' +#apache::default_user : 'user' +#apache::default_group : 'user' + +# Manage your app +#apache::sites: +# myapp: +# docroot : "/vagrant/" +# server_alias : 'myapp vagrant localhost' +# use : [ "Site myapp" ] +# tag : 'all' +# owner : vagrant +# group : vagrant +# mpm_user : vagrant +# mpm_group : vagrant +# password : '$5$NZfZqcdyZ3Xt$.kfZejriEJP3fc6RU0gBGEzMPQ/c3XiowVImB6VDrtD' +# shell : '/bin/bash' diff --git a/puppet/config/node/links.example.org.yaml b/puppet/config/node/links.example.org.yaml new file mode 100644 index 0000000..449feff --- /dev/null +++ b/puppet/config/node/links.example.org.yaml @@ -0,0 +1,67 @@ +--- +# +# Nodo +# +nodo::role: 'web' + +# +# Classes +# +classes: + - 'php' + +# +# MySQL +# +mysql::server::implementation: 'mariadb-server' +mysql::implementation: 'mariadb-client' + +# +# Backup +# +nodo::subsystem::backup::localhost : false +nodo::subsystem::backup::encryptkey : 'none' +nodo::subsystem::backup::password : 'hackme' + +# +# Websites +# +#websites::default_db : 'dbname' +#websites::default_db::password : 'hackme' + +# +# Apache +# +#apache::default_folder : '/srv/kvmx' +#apache::default_user : 'user' +#apache::default_group : 'user' + +# Manage your app +#apache::sites: +# myapp: +# docroot : "/vagrant/" +# server_alias : 'myapp vagrant localhost' +# use : [ "Site myapp" ] +# tag : 'all' +# owner : vagrant +# group : vagrant +# mpm_user : vagrant +# mpm_group : vagrant +# password : '$5$NZfZqcdyZ3Xt$.kfZejriEJP3fc6RU0gBGEzMPQ/c3XiowVImB6VDrtD' +# shell : '/bin/bash' +apache::sites: + semanticscuttle: + docroot : '/srv/shared/www' + server_alias : '10.0.2.2' + allow_override : 'All' + owner : 'user' + group : 'user' + error_log : true + custom_log : true + custom_log_format : 'custom' + custom_directives : > + <Directory /srv/shared> + Options Indexes Includes FollowSymLinks MultiViews + AllowOverride All + Require all granted + </Directory> diff --git a/puppet/config/secrets/node/links.example.org.yaml b/puppet/config/secrets/node/links.example.org.yaml new file mode 100644 index 0000000..182dd01 --- /dev/null +++ b/puppet/config/secrets/node/links.example.org.yaml @@ -0,0 +1,10 @@ +# +# MySQL +# +# The following password is public information and therefore +# shall not be user on production. +mysql::server::rootpw: 'k8tKW9Y14Tr6xoqRDJbMzt1hackme' + +database::instances: + semanticscuttle: + password: 'LLIX7nN9t7ymhackme' diff --git a/puppet/files/.empty b/puppet/files/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/puppet/files/.empty diff --git a/puppet/files/patches/trusty/puppet-stack-level.md b/puppet/files/patches/trusty/puppet-stack-level.md new file mode 100644 index 0000000..9a3f4d7 --- /dev/null +++ b/puppet/files/patches/trusty/puppet-stack-level.md @@ -0,0 +1,3 @@ +# Puppet stack level patch + +* [Puppet master fails with 'stack level too deep' error when storeconfigs = true](https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1313595). diff --git a/puppet/files/patches/trusty/puppet-stack-level.patch b/puppet/files/patches/trusty/puppet-stack-level.patch new file mode 100644 index 0000000..1d112f7 --- /dev/null +++ b/puppet/files/patches/trusty/puppet-stack-level.patch @@ -0,0 +1,15 @@ +--- /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb.orig 2015-10-19 17:19:13.500193213 -0200 ++++ /usr/lib/ruby/vendor_ruby/puppet/rails/resource.rb 2015-10-19 17:19:58.972194943 -0200 +@@ -84,7 +84,11 @@ + end + + def [](param) +- super || parameter(param) ++ if param == 'id' ++ super ++ else ++ super || parameter(param) ++ end + end + + # Make sure this resource is equivalent to the provided Parser resource. diff --git a/puppet/files/patches/wheezy/collected-resources.md b/puppet/files/patches/wheezy/collected-resources.md new file mode 100644 index 0000000..b2ce77d --- /dev/null +++ b/puppet/files/patches/wheezy/collected-resources.md @@ -0,0 +1,3 @@ +# Collected resources patch + +* [Bug #10963: Collected resources with a puppet master fail on Ruby 1.9.x - Puppet - Puppet Labs](https://projects.puppetlabs.com/issues/10963). diff --git a/puppet/hiera.yaml b/puppet/hiera.yaml new file mode 120000 index 0000000..31df718 --- /dev/null +++ b/puppet/hiera.yaml @@ -0,0 +1 @@ +config/hiera.yaml
\ No newline at end of file diff --git a/puppet/kvmxfile b/puppet/kvmxfile new file mode 100644 index 0000000..7ab8cef --- /dev/null +++ b/puppet/kvmxfile @@ -0,0 +1,98 @@ +# +# Sample kvmx file - https://kvmx.fluxo.info +# + +# Which base box you should use. Leave unconfigured to use kvmx-create instead. +#basebox="stretch" + +# First user name +#user="vagrant" +user="user" + +# First user password +#password="vagrant" +password="user" + +# Set this is you want to be able to share folders between host and guest. +shared_folder="." +#shared_folder_mountpoint="/vagrant" +shared_folder_mountpoint="/srv/kvmx" + +# Folder to sync during provisioning in the format "/host/folder /guest/folder". +provision_rsync="puppet /etc/puppet" + +# Options for provision_rsync +provision_rsync_opts="--exclude=.git --exclude=keys --exclude=config/secrets" + +# Absolute path for a provision script located inside the guest. +provision_command="/etc/puppet/bin/provision && /etc/puppet/bin/deploy" + +# Graphics +# See https://wiki.archlinux.org/index.php/QEMU#Graphics +#graphics="-vga std -nographic -vnc :$GUEST_DISPLAY" +graphics="-vga qxl" + +# VNC Client +#vnc_client="xtightvncviewer" +#vnc_client="xvnc4viewer" +#vnc_client="xvncviewer" +vnc_client="virt-viewer" + +# Set this if you want to automatically attach an spice client when the machine +# boots. +run_spice_client="0" + +# Set additional hostfwd mappings +#port_mapping="hostfwd=tcp:127.0.0.1:8080-:80,hostfwd=tcp:127.0.0.1:8443-:443" + +# Where the guest image is stored +#image="$HOME/.local/share/kvmx/$VM/box.img" + +# Image size +size="10G" + +# Image format: raw or qcow2 +format="qcow2" + +# Image compression (qcow2 only) +qcow2_compression="1" + +# Memory +memory="512" + +# Bootstrap method: custom or vmdeboostrap +method="custom" + +# Hostname +hostname="puppet" + +# Domain +domain="example.org" + +# System arch +arch="amd64" + +# Box distribution when bootstraping a new image +version="stretch" + +# Debian mirror +mirror="http://http.debian.net/debian/" + +# Enables remote administration using SSH. With this configuration enabled, +# kvmx will be able to administer a running virtual machine using SSH access +# inside the virtual machine. +ssh_support="y" + +# Use a custom, per-virtual-machine generated SSH keypair. If you disable this +# configuration but still want guest administration using SSH, the default +# insecure keypair will be used. +# +# Please note that this setting won't take effect if you're using a basebox. +# In that case the basebox keypair will be used if it exists, otherwise kvmx +# fallsback to the default insecure keypair. +# +# This setting is used during virtual machine bootstrapping by kvmx-create. +ssh_custom="y" + +# Bootloader (used only during bootstrapping by kvmx-create). +bootloader="grub" diff --git a/puppet/manifests/nodes/.empty b/puppet/manifests/nodes/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/puppet/manifests/nodes/.empty diff --git a/puppet/manifests/nodes/default.pp b/puppet/manifests/nodes/default.pp new file mode 100644 index 0000000..5ebbf90 --- /dev/null +++ b/puppet/manifests/nodes/default.pp @@ -0,0 +1,3 @@ +node default { + include nodo +} diff --git a/puppet/modules/.empty b/puppet/modules/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/puppet/modules/.empty diff --git a/puppet/puppet b/puppet/puppet new file mode 120000 index 0000000..945c9b4 --- /dev/null +++ b/puppet/puppet @@ -0,0 +1 @@ +.
\ No newline at end of file diff --git a/res/docs/header.tpl.html b/res/docs/header.tpl.html deleted file mode 100644 index ee0650f..0000000 --- a/res/docs/header.tpl.html +++ /dev/null @@ -1,8 +0,0 @@ -<ul class="menu"> - <li><a href="index.html">Index</a></li> - <li><a href="INSTALL.html">Installation</a></li> - <li><a href="UPGRADE.html">Upgrade</a></li> - <li><a href="ChangeLog.html">ChangeLog</a></li> - <li><a href="http://semanticscuttle.sourceforget.net/">Homepage</a></li> - <li><a href="https://sourceforget.net/projects/semanticscuttle">Project page</a></li> -</ul> diff --git a/res/docs/style.css b/res/docs/style.css deleted file mode 100644 index 90a3fbc..0000000 --- a/res/docs/style.css +++ /dev/null @@ -1,28 +0,0 @@ -/* SemanticScuttle improvements */ -.document { - max-width: 100ex; -} -h1.title { - background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAsvSURBVGiBxZprjCRXdcd/p6r6Nd0979mHZ+3sCkfx4AdJsAhGm2BMYhAbrAgsEimKjGIlxELk8SkrQoQiSGgrCSJZh9hECsQ8hJCQlRDjYDsY4RAvRF6b9drN2t7HzOzOzmtnpl/V1fW4Jx+qu6emZ3pmbI/kI7Wq+9Ste///87j33FstqspeS7kkR4HPAAeAx4G/mDqu9T0fCJC9JlAuyXuB72Ymbklnxt9K/fxjmFblf4A7p45rc08HA6y97KxcksPAI5mJW9JDN99DbvI2Rt7+CSSVPwo8tJdjdWRPCQAPWZmhYuHn70LwyeQFOzvC4C/cDfB75ZL85h6Pt3cEyiW5B7gzf+T9ABRGM+SHHFIZQ3p8isz4TajyYLkkQ3s1JuwRgXJJ9gGfT49NkSpeQzYvpDMKxic/kkLUp3D9MaxUbhL4u70YsyN75YH7xcmN5q75FUQCCqNp0BaYFraE5IdTiJUmf+ROVLm3XJLb9mjcN06gXJJ3Avdk9/0iqDK0L4slAZgA1Af1yeaFVMaQGXsrqeKkGOWBckn2xHhvqJNySQQ4YWVHxRk8RCYvZHICptX1ACYmURhLo8Zj4OfegyXyy8C9bzoB4GPArZmxKYg8hvbn2lYP2sCDLgnHMQwMOtjZETLjN2IMnyuXZORNI1AuyU3A553CJOJkKY5ncZxog9W7V/XBtOKExid78Fbs9MCYUf71TSHQBv8tSeVzTnESJxVSnMgkgLfWwyhBxCJgcF8WEPJxKP1WuSSfLZdk8PUS2FUpUS7JAeCdwG3AMeBGsbOkhg5jpXNM3nQd6YEsiAU48VVsoH0VC7Db323WrtRorHr4Ky/TWnwejVot4HvAD4BngOemjmvrdRMol+Qg8OvAbwC/ChwGASuFlcphpQqIk0XEZuL6/QzuH2kD7AVub6lXtVi6sELgGRAhbMwTVGeJGgsYvwrgA6eAp4iLwf+dOq7+tgTKJbkF+Ggb9E3xbQssG7EcxE6D2IjYWKkU+fFBhg+MkhvO94DcgUj7atSisdKkWfXbRGzEstEoIGouE7qLhLU5ouYSQAP4IfBd4OGp41rtEnjpc+SBh4EPbe0kC7EtcsMFsoMFBkYK5EeKWI5DMiz6hctu9IGvePWAoBkReBFhAGK125mAsD5PULtEsHYOjVoV4ONTx/XrHQL/DPzRBrdYwsDwAPmRPAOjA2QLWcSSra2btHI//WsIL8TGRELLDWm5AX4jJAxBxAYUb/4U3sIpBd4+dVyfc4APdIAXxguMXjtKbjiHZW01QUWg7Y9YoB0gUft7r5UT+k7bThttA07q220tyyZXsMgVB0AswgBa9YD6VZfMvrfhLZwS4H3Acw5wBbgOIFvMkh/Nbx1JG8SAGiBMAEiAwtqlPtqsJ6mPDeA4NtagTW2xhb86DcBilaWp+ElOdGAtX1ymsdLYBYFer/QuWtuvBxv0Znf6lZkrBG4Fb/5ZWgGLv/sgMyIybgHfaIWcBEDh8guX8Ztbzli7INIuHbpg2wWdWS8pNul7wXafXddXrizjXl2jefkkGrp8v8wDl1fxgWtFVbnvDvmlj93B4xmHcYBMPsPhWw9jpTKQmoD0frAH25177U8LWpdiXV/pJKnD5tlod/pGxWPp3ApB5SJhbZZXF/jWXV/gi+0BPAfgwac4m0nxl39wO/9oWU4qdeiDVPQwwweuRTqdqqGbxGisswvgnoX6s+DP9/FKlIjpZPJaINH66r2FvtWIWHplkdBdIazNslLn2d/+Ig8mBlhxAFTVFZHv33CQv3/3DeHxsDKNHjpKo+pQGMkCJgathvUENhDWYw9N3A2RC9WT4L60BZH2MxomQDqsz1JRj/UjAs9w5cV5Qq9BUJnGC7jyx1/jr5o+Zt06TCfnyvP3/RuPlOf4qjf/f9TPPUqr5uKu1duDR20gHasaEI0BRY04pIbfCxO/E3tmS9GYxIaE3Vy1Rn6TuTMXCRprBJUZwkgbJ57gk6emqSY6e0VV/S4BVQ2BMx8+wZcurfBfjYtP0Jw7ibtap9VorpPoeiFK6NqhEC6DpODgH0L+5j4kkuGVTPo4adW0mDtzkVa1QtiYx6gJvvljPvnlp7mQePiSqi5ATzmtqi5Q/tAJ/na5xo9rZx8hqFygtrhGFAY9edDxSoIIGs8e3kzbGx8Ba6d1xazPSuqzfH6OxtU1Im8VNZF54gx//Tff4aeJB1aB850fm5ZbVb1a9zh3z5f4tOub2erZb2OCJtWFVbTXA0SgGv/uxnk7X7yLYGXhmvtg6NdAMjsQUZprNZbPz6GBCxpx5jJf/rNv8INEIxd4SRMl9JYbGlWdvrDMxa88zWej5mrUuPgkgesTND02JHHXI4ZNeYKBYAXcn8XhdOhPYfg9YOX6Urg6c7VrkEqTFz/6L3w9cdsHXmiHele225G9/MCTPLNc5ydB7TKqESYMEiAT4DeFVfJ+CM2XYyK5G2DyT+LwckY3DRj669gef4Gv9Mw4L6iq1/uM0w+9qqqIvCTgYhIzT8f6vSFDMg96pls1ENXiKVYccEZg7FgcVurH9/wl0qOD+P4FIneReovOQbACL6pufbq97Z5YVaPhAdZQAyaKc6BfyCRnpU0eSuiNB/5lcF+BxumYlHcJALt4mIHrbgfAGDpxPqOqq/0w9vVAt4HNsDgZVCNEeuM/4YEu4J6k3tCm10OJtlEL9eYIKi4gjBd1kHgnNr0tvp0IAAcklQcTYdusg9guZDbptgK/+b6dEtTEZcdYIRwFmrrDqcOuCFhODtUIy5adwe8EuGv5iI3eM9iOgEaIZTM0EI62B9tWtiVQLkkKGBUnBxph2dtZOxE+m0gpuwkv26HtAYtChlF2cW61kwdGABE7jYhB+gF+LR7YcN9sIG070ClLBjKMA+k3SqAI8QmBSD/rbgTsey2aqw3ctRqRH5DOp8gP58gW03EObUkq7ltsUDWIWKQsBvaMAGLH1t9g1XUPGBPhrtSoLVUJ3BaqBtNaw/gNAncI92oVMORHcwzuK5IZcLYIL4NldQwBjr2HBERsxNq8iEVBQG2pSn25hgkCTFAnqM4QuUto1DkZFKx0ATs3Ri0coba4RibvMLS/SH4kF3u23a9lxTmgqjgWOUBExOktH14LgWx86cR63LlXaVBfqeFVXTSKCN0Fgso0xlvBGPzFKj86fYmny3PM3DGltx3ZV7u94NfeQnUWOzuK8YfxKnVsRyiO5ylMDJDJOSCdRdEQbwUBsIHXTWAJwAQNAs9nZfYqzaqL8QNM6BJUZwmrs2jk4Ycsn73Cv3/he3znmXOsdTp46CleBb7658e45f03R3fvG1w6Ks0lS1J5onSRVa/Jyqwhk0/hZKx4xTchrYCVBIG+shOBl4FaUJku2rkx6o0KUXM5PohtLqOqutrg1LMXefTTj/DDNbe/pe5/lNP3P8rpY29j/73v5oNHJhrvywSNiQgLK53HCzLxwa+JX46sNji3G4w7Hq+XS/IJVf5BBOnoWgGL5xZ57OEf8dh/PMdWu/mO+MQbkByw4R1ALo31qbt4x7uu5wMTg7zLknWgfsjyp77Nx//zeRaA09vVQrt6P/CZD8vv33CQo65P9acznP2n/+ZnftgtdXtFgWVgTlW7oSQiGeL/TlxDz+xy6xEGP/IObj48zlu8APeBJ3niJ+eptG8/r6oV+siuCIjIjRCfGW0jIfEx5WXV/i8nRESACWCSHq/0kZPb9bebWghgkf4E1oB5YElV+3mlK+3ibBFYFJECsVf298Gyth142KUHAERkEjgEpIA6cWwvbLVLeq0iIhYwRuyZQeKZZxV4VXXboz/+HwP+91Qbpr+OAAAAAElFTkSuQmCC"); - background-repeat: no-repeat; - padding-left: 64px; - padding-top: 0.2em; - margin-bottom: 00px; - height: 60px; - border-bottom: 3px solid #666; -} -h2 { - margin-top: 1.5em; - -} -pre { - padding: 1em; - background-color: #EEE; - border: 1px solid #BBB; - width: auto; -} - -tt, code { - background-color: #DDD; - padding: 0.2ex; -} diff --git a/scripts/bookmark-bot.php b/scripts/bookmark-bot.php new file mode 100755 index 0000000..126f39c --- /dev/null +++ b/scripts/bookmark-bot.php @@ -0,0 +1,125 @@ +#!/usr/bin/env php +<?php +/** + * CLI tool to add bookmarks to SemanticScuttle. + * Intended as end point for a chat bot, e.g. "errbot-exec". + * + * Parameters: + * 1. Message with bookmark url and tags + * 2. E-Mail address of user + * + * You may map chat users to semanticscuttle email addresses + * with the $botMailMap config variable + * + * @author Christian Weiske <cweiske@cweiske.de> + * @link https://github.com/cweiske/errbot-exec + */ +require_once dirname(__FILE__) . '/../src/SemanticScuttle/header-standalone.php'; + +if ($argc < 3) { + err('No message and user', 1); +} +$msg = $argv[1]; +$email = $argv[2]; + +if (preg_match('#(.+@.+)/.*#', $email, $matches)) { + //xmpp user name with resource: user@example.org/client + $email = $matches[1]; +} +if (isset($botMailMap[$email])) { + $email = $botMailMap[$email]; +} + +function err($msg, $code) +{ + echo $msg . "\n"; + exit($code); +} + +function getUserId($email) +{ + $users = SemanticScuttle_Service_Factory::get('User'); + if (!$users->isValidEmail($email)) { + err('Invalid e-mail address: ' . $email, 2); + } + $db = SemanticScuttle_Service_Factory::getDb(); + $res = $db->sql_query( + 'SELECT uId FROM '. $users->getTableName() + . ' WHERE email = "' . $db->sql_escape($email) . '"' + ); + $row = $db->sql_fetchrow($res); + if (!is_array($row)) { + err('User not found: ' . $email, 3); + } + return intval($row['uId']); +} + +function splitMsg($msg) +{ + $bmUrl = $msg; + $rest = ''; + if (strpos($msg, ' ') !== false) { + list($bmUrl, $rest) = explode(' ', $msg, 2); + } + $parts = parse_url($bmUrl); + if (!isset($parts['scheme'])) { + err('Scheme missing in URL', 2); + } + if (!SemanticScuttle_Model_Bookmark::isValidUrl($bmUrl)) { + err('Invalid bookmark URL', 2); + } + + $bmTags = array(); + $bmDesc = ''; + $rest = trim($rest); + if (strlen($rest) && $rest{0} == '#') { + //tags begin with '#' + preg_match_all('/#([a-zA-Z0-9]+)/', $rest, $matches); + $bmTags = $matches[1]; + foreach ($matches[0] as $tag) { + if (substr($rest, 0, strlen($tag)) == $tag) { + $rest = trim(substr($rest, strlen($tag))); + } + } + $bmDesc = $rest; + } else { + //use rest as tags + $bmTags = explode(' ', $rest); + $bmTags = array_map('trim', $bmTags); + } + + return array($bmUrl, $bmTags, $bmDesc); +} + +$userId = getUserId($email); +list($bmUrl, $bmTags, $bmDesc) = splitMsg($msg); + +$bookmarks = SemanticScuttle_Service_Factory::get('Bookmark'); +if ($bookmarks->bookmarkExists($bmUrl)) { + echo "URL already bookmarked.\n"; + exit(0); +} + +$urlhelper = new SemanticScuttle_UrlHelper(); +$bmTitle = $urlhelper->getTitle($bmUrl); + +$id = $bookmarks->addBookmark( + $bmUrl, + $bmTitle, + $bmDesc, + null, + SemanticScuttle_Model_Bookmark::SPUBLIC, + $bmTags, + null, + null, + true, + false, + $userId +); +if ($id === false) { + err('Error adding bookmark', 10); +} else { + echo "Bookmark created.\n"; + exit(0); +} +?> diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index ea8762d..8a8946a 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -504,7 +504,9 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService 'bPrivateNote' => $privateNote, 'bStatus' => intval($status), 'bHash' => $this->getHash($address), - 'bShort' => $short + 'bShort' => $short, + 'bVoting' => 0, + 'bVotes' => 0, ); $sql = 'INSERT INTO '. $this->getTableName() @@ -738,7 +740,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $tags = []; } - $tagcount = count($tags); + $tagcount = empty($tags) ? 0 : count($tags); for ($i = 0; $i < $tagcount; $i ++) { $tags[$i] = trim($tags[$i]); } @@ -861,7 +863,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService } // Search terms in tags as well when none given - if (!count($tags)) { + if (!empty($tags)) { $query_2 .= ' LEFT JOIN '. $b2tservice->getTableName() .' AS T' . ' ON B.bId = T.bId'; $dotags = true; @@ -1144,7 +1146,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService // Delete final / if (substr($address, -1) == '/') { - $address = substr($address, 0, count($address)-2); + $address = substr($address, 0, strlen($address)-2); } return $address; diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index a01b5d7..2579022 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -691,14 +691,12 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService } if ($sortOrder == 'alphabet_asc') { - usort($output, create_function('$a,$b','return strcasecmp(utf8_deaccent($a["tag"]), utf8_deaccent($b["tag"]));')); + usort($output, "cmp"); } return $output; } - - /** * Deletes all tags in bookmarks2tags * @@ -711,4 +709,10 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService } } + +function cmp($a,$b) +{ + return strcasecmp(utf8_deaccent($a["tag"]), utf8_deaccent($b["tag"])); +} + ?> diff --git a/src/SemanticScuttle/UrlHelper.php b/src/SemanticScuttle/UrlHelper.php new file mode 100644 index 0000000..5417b9b --- /dev/null +++ b/src/SemanticScuttle/UrlHelper.php @@ -0,0 +1,65 @@ +<?php +/** + * SemanticScuttle - your social bookmark manager. + * + * PHP version 5. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske <cweiske@cweiske.de> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +/** + * Work with URLs + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske <cweiske@cweiske.de> + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class SemanticScuttle_UrlHelper +{ + function getTitle($url) + { + $fd = @fopen($url, 'r'); + $title = ''; + if ($fd) { + $html = fread($fd, 1750); + fclose($fd); + + // Get title from title tag + preg_match_all('/<title[^>]*>(.*)<\/title>/si', $html, $matches); + $title = $matches[1][0]; + + $encoding = 'utf-8'; + // Get encoding from charset attribute + preg_match_all('/<meta.*charset=([^;"]*)">/i', $html, $matches); + if (isset($matches[1][0])) { + $encoding = strtoupper($matches[1][0]); + } + + // Convert to UTF-8 from the original encoding + if (function_exists("mb_convert_encoding")) { + $title = @mb_convert_encoding($title, 'UTF-8', $encoding); + } + + $title = trim($title); + } + + if (utf8_strlen($title) > 0) { + $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); + return $title; + } else { + // No title, so return filename + $uriparts = explode('/', $url); + $filename = end($uriparts); + unset($uriparts); + + return $filename; + } + } +} +?> diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 1f2f12c..562ae43 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -105,6 +105,7 @@ require_once 'SemanticScuttle/functions.php'; require_once 'SemanticScuttle/Model/Bookmark.php'; require_once 'SemanticScuttle/Model/UserArray.php'; require_once 'SemanticScuttle/Model/User/SslClientCert.php'; +require_once 'SemanticScuttle/UrlHelper.php'; if (count($GLOBALS['serviceoverrides']) > 0 && !defined('UNIT_TEST_MODE') diff --git a/www/.htaccess b/www/.htaccess index 5799444..e79169b 100644 --- a/www/.htaccess +++ b/www/.htaccess @@ -10,7 +10,7 @@ Options -MultiViews +FollowSymLinks # Rewrite clean URLs onto real files <IfModule mod_rewrite.c> -Options +FollowSymlinks +Options -MultiViews +FollowSymlinks RewriteEngine On RewriteCond %{REQUEST_FILENAME}.php -f RewriteRule ^([^/.]+)/?(.*)$ /$1.php/$2 [QSA,L] @@ -38,3 +38,11 @@ ExpiresByType text/css "access plus 15 days" SetOutputFilter DEFLATE #</FilesMatch> </IfModule> + +# Workaround to decrease resource consumption +<If "-f %{DOCUMENT_ROOT} . '/.htpasswd'"> +AuthType Basic +AuthName "links - semanticscuttle" +AuthUserFile /var/sites/links/site/.htpasswd +Require valid-user +</If> diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php index e1fbe30..b95e29b 100644 --- a/www/ajaxGetTitle.php +++ b/www/ajaxGetTitle.php @@ -27,53 +27,11 @@ require_once 'www-header.php'; /* Managing all possible inputs */ isset($_GET['url']) ? define('GET_URL', $_GET['url']): define('GET_URL', ''); +$urlhelper = new SemanticScuttle_UrlHelper(); -function getTitle($url) { - $fd = @fopen($url, 'r'); - if ($fd) { - $html = fread($fd, 1750); - fclose($fd); - - // Get title from title tag - preg_match_all('/<title>(.*)<\/title>/si', $html, $matches); - $title = $matches[1][0]; - - $encoding = 'utf-8'; - // Get encoding from charset attribute - preg_match_all('/<meta.*charset=([^;"]*)">/i', $html, $matches); - if (isset($matches[1][0])) { - $encoding = strtoupper($matches[1][0]); - } - - // Convert to UTF-8 from the original encoding - if (function_exists("mb_convert_encoding")) { - $title = @mb_convert_encoding($title, 'UTF-8', $encoding); - } - - $title = trim($title); - - if (utf8_strlen($title) > 0) { - $title = html_entity_decode($title, ENT_QUOTES, 'UTF-8'); - return $title; - } else { - // No title, so return filename - $uriparts = explode('/', $url); - $filename = end($uriparts); - unset($uriparts); - - return $filename; - } - } else { - return false; - } -} -echo '<?xml version="1.0" encoding="utf-8"?>'; +echo '<?xml version="1.0" encoding="utf-8"?>' . "\n"; ?> <response> -<method> -getTitle -</method> -<result> -<?php echo getTitle(GET_URL); ?> -</result> + <method>getTitle</method> + <result><?php echo htmlspecialchars($urlhelper->getTitle(GET_URL)); ?></result> </response> diff --git a/www/permalink.php b/www/permalink.php new file mode 100644 index 0000000..d389294 --- /dev/null +++ b/www/permalink.php @@ -0,0 +1,122 @@ +<?php +/*************************************************************************** + Copyright (C) 2004 - 2006 Scuttle project + http://sourceforge.net/projects/scuttle/ + http://scuttle.org/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ***************************************************************************/ + +require_once 'www-header.php'; + +/* Service creation: only useful services are created */ +$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); +$cacheservice =SemanticScuttle_Service_Factory::get('Cache'); + +/* Managing all possible inputs */ +isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', ''); +isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0); +isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', ''); + + +// Logout action +if (GET_ACTION == "logout") { + $userservice->logout(); + $tplVars['currentUser'] = null; + $tplvars['msg'] = T_('You have now logged out'); +} + + +// Header variables +$tplVars['loadjs'] = true; +$tplVars['rsschannels'] = array( + array( + sprintf(T_('%s: Recent bookmarks'), $sitename), + createURL('rss') . '?sort=' . getSortOrder() + ) +); + +if ($userservice->isLoggedOn()) { + if ($userservice->isPrivateKeyValid($currentUser->getPrivateKey())) { + $currentUsername = $currentUser->getUsername(); + array_push( + $tplVars['rsschannels'], + array( + sprintf( + T_('%s: Recent bookmarks (+private %s)'), + $sitename, $currentUsername + ), + createURL('rss') + . '?sort=' . getSortOrder() + . '&privateKey=' . $currentUser->getPrivateKey() + ) + ); + } +} + +if ($usecache) { + // Generate hash for caching on + $hashtext = $_SERVER['REQUEST_URI']; + if ($userservice->isLoggedOn()) { + $hashtext .= $userservice->getCurrentUserID(); + } + $hash = md5($hashtext); + + // Cache for 15 minutes + $cacheservice->Start($hash, 900); +} + +// Pagination +$perpage = getPerPageCount($currentUser); +if (intval(GET_PAGE) > 1) { + $page = intval(GET_PAGE); + $start = ($page - 1) * $perpage; +} else { + $page = 0; + $start = 0; +} + +$tplVars['page'] = $page; +$tplVars['start'] = $start; +$tplVars['popCount'] = 30; +$tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"]; +$tplVars['range'] = 'all'; +$tplVars['pagetitle'] = T_('Store, share and tag your favourite links'); +$tplVars['subtitle'] = T_('All Bookmarks'); +$tplVars['bookmarkCount'] = $start + 1; + +//$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); +list ($url, $bid) = explode('/', $_SERVER['PATH_INFO']); +$bookmark = $bookmarkservice->getBookmark($bid, TRUE); +$bookmarks = array('bookmarks' => array($bookmark)); +$tplVars['pagetitle'] = $bookmark['bTitle']; + +$tplVars['total'] = $bookmarks['total']; +$tplVars['bookmarks'] = $bookmarks['bookmarks']; +$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); +//$tplVars['cat_url'] = createURL('tags', '%2$s'); +$tplVars['nav_url'] = createURL('index', '%3$s'); +$tplVars['summarizeLinkedTags'] = true; +$tplVars['pageName'] = PAGE_BOOKMARKS; +$tplVars['user'] = ''; +$tplVars['currenttag'] = ''; + +$templateservice->loadTemplate('bookmarks.tpl', $tplVars); + +if ($usecache) { + // Cache output if existing copy has expired + $cacheservice->End($hash); +} +?> diff --git a/www/robots.txt b/www/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/www/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / diff --git a/www/themes/mono/icon.png b/www/themes/mono/icon.png Binary files differnew file mode 100644 index 0000000..713f1eb --- /dev/null +++ b/www/themes/mono/icon.png diff --git a/www/themes/mono/images/b_edit.png b/www/themes/mono/images/b_edit.png Binary files differnew file mode 100644 index 0000000..05711a0 --- /dev/null +++ b/www/themes/mono/images/b_edit.png diff --git a/www/themes/mono/images/bg_admin.png b/www/themes/mono/images/bg_admin.png Binary files differnew file mode 100644 index 0000000..c707779 --- /dev/null +++ b/www/themes/mono/images/bg_admin.png diff --git a/www/themes/mono/images/bg_bar.png b/www/themes/mono/images/bg_bar.png Binary files differnew file mode 100644 index 0000000..7152ba1 --- /dev/null +++ b/www/themes/mono/images/bg_bar.png diff --git a/www/themes/mono/images/bg_header.png b/www/themes/mono/images/bg_header.png Binary files differnew file mode 100644 index 0000000..6fa4161 --- /dev/null +++ b/www/themes/mono/images/bg_header.png diff --git a/www/themes/mono/images/bg_sidebar.png b/www/themes/mono/images/bg_sidebar.png Binary files differnew file mode 100644 index 0000000..0edb153 --- /dev/null +++ b/www/themes/mono/images/bg_sidebar.png diff --git a/www/themes/mono/images/loading.gif b/www/themes/mono/images/loading.gif Binary files differnew file mode 100644 index 0000000..859126e --- /dev/null +++ b/www/themes/mono/images/loading.gif diff --git a/www/themes/mono/images/logo-empty.png b/www/themes/mono/images/logo-empty.png Binary files differnew file mode 100644 index 0000000..4590098 --- /dev/null +++ b/www/themes/mono/images/logo-empty.png diff --git a/www/themes/mono/images/logo.png b/www/themes/mono/images/logo.png Binary files differnew file mode 100644 index 0000000..4afe565 --- /dev/null +++ b/www/themes/mono/images/logo.png diff --git a/www/themes/mono/images/logo_24.gif b/www/themes/mono/images/logo_24.gif Binary files differnew file mode 100644 index 0000000..d5af64d --- /dev/null +++ b/www/themes/mono/images/logo_24.gif diff --git a/www/themes/mono/images/rss.gif b/www/themes/mono/images/rss.gif Binary files differnew file mode 100644 index 0000000..094ba10 --- /dev/null +++ b/www/themes/mono/images/rss.gif diff --git a/www/themes/mono/images/thumbs_up.orig.png b/www/themes/mono/images/thumbs_up.orig.png Binary files differnew file mode 100644 index 0000000..1a89d0e --- /dev/null +++ b/www/themes/mono/images/thumbs_up.orig.png diff --git a/www/themes/mono/images/vote-against-voted.png b/www/themes/mono/images/vote-against-voted.png Binary files differnew file mode 100644 index 0000000..740dfc8 --- /dev/null +++ b/www/themes/mono/images/vote-against-voted.png diff --git a/www/themes/mono/images/vote-against.png b/www/themes/mono/images/vote-against.png Binary files differnew file mode 100644 index 0000000..f15ea4d --- /dev/null +++ b/www/themes/mono/images/vote-against.png diff --git a/www/themes/mono/images/vote-for-voted.png b/www/themes/mono/images/vote-for-voted.png Binary files differnew file mode 100644 index 0000000..5abd43e --- /dev/null +++ b/www/themes/mono/images/vote-for-voted.png diff --git a/www/themes/mono/images/vote-for.png b/www/themes/mono/images/vote-for.png Binary files differnew file mode 100644 index 0000000..5973ae9 --- /dev/null +++ b/www/themes/mono/images/vote-for.png diff --git a/www/themes/mono/scuttle.css b/www/themes/mono/scuttle.css new file mode 100644 index 0000000..f90c4cd --- /dev/null +++ b/www/themes/mono/scuttle.css @@ -0,0 +1,703 @@ +/* Watch out. This file bugs (in the header) when it is formated with Eclipse (Ctrl+Shift+F)*/ + +/* BASE */ + +* { + font-family: fixed, monospace; +} +a { + color: #005fff; + /*color: #5b5b5b;*/ + text-decoration: none; +} +a:hover { + color: #258; + text-decoration: underline; +} +a img { + border: 0; +} + + +body { + margin: 0; + padding: 0; +} +input[type=text], +input[type=password], +select, +textarea { + border: 1px solid #AAA; + padding: 0.1em; +} +input[type=text], +input[type=password], +textarea { + padding: 0.2em; +} +input[type=text]:focus, +input[type=password]:focus, +select:focus, +textarea:focus { + border-color: #666; +} +p.tipMsg, +p.error, +p.success { + border: 1px solid; + font-size: small; + margin: 0.5em; + padding: 0.5em; + width: 70%; +} +p.tipMsg { + background: #FFFF99; + border-color: #CC9900; + color: #CC9900; +} +p.error { + background: #FCC; + border-color: #966; + color: #633; +} +p.success { + background: #CFC; + border-color: #696; + color: #363; +} +td#availability { + color: #285; + font-weight: bold; +} +td#availability.not-available { + color: #F00; +} +textarea { + font-size: small; + padding: 0.2em; +} +th { + padding-right: 1em; + text-align: right; +} + +/* HEADER */ + +/* +div#header { + background: #FFF url('images/bg_header.png') bottom repeat-x; + border-bottom: 3px solid #9CD; + clear: both; +} +*/ +div#header:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +* html div#header { + height: 1%; +} +h1 { + float: left; + font-size: x-large; + font-weight: bold; + letter-spacing: 0.25em; + margin: 0; + padding: 1em; +} + +/* +html > body h1 { + background: url('images/logo.png') no-repeat 10px; + padding-left: 75px; +} +*/ + +html > body div#header.popup h1 { + background: url('images/logo.png') no-repeat 10px; + background-size: 24px; + padding: 0.5em 0.5em 0.5em 50px; +} +/*html > body div#header #welcome { + position:absolute; + left:75px; +}*/ +#welcome { + border: 10px solid #5b5b5b; + width: 66%; + padding: 10px; + text-align:center; + font-size: medium; +} +#bottom { + padding-top: 10px; + text-align: center; + font-size: xx-small; +} +h1 a { + color: #000; +} +h1 a:hover { + color: #000; +} +h2 { + /*background: #000 url('images/bg_bar.png') center center repeat-x;*/ + background: #5b5b5b; + border-bottom: 3px solid #5b5b5b; + clear: both; + color: #FFF; + font-size: medium; + letter-spacing: 0.1em; + margin: 0 0 1em 0; + padding: 0.5em 1em; +} +h2 a, h2 a:hover { + color: #DDD; +} + +/*sup { + color: #77ABE0; + font-weight: bold; +}*/ + +/* NAVIGATION */ + +ul#navigation { + list-style-type: none; + margin: 0; + padding: 1.75em 1em; + width: auto; +} +ul#navigation a { + font-size: medium; + font-weight: bold; + padding: 0.2em 0.5em; +} +ul#navigation a:hover { + background: #7AD; + color: #FFF; +} +ul#navigation li { + float: left; +} +ul#navigation li.access { + float: right; +} + +/* BOOKMARKS */ + +ol#bookmarks { + list-style-type: none; + margin: 0; + padding: 0 1em; + width: 70%; +} +html > body ol#bookmarks { + margin: 0 1em; + padding: 0; +} +img.thumbnail { + float: left; + padding: 1px; + margin-right: 6px; + margin-bottom:4px; + border:1px solid #AAA; +} +div.link a { + /*color: #5b5b5b;*/ + color: #005fff; + text-decoration: none; + font-size: medium; +} +div.link a:hover { + text-decoration: underline; +} +div.link a:visited { + color: purple; +} +div.address { + color: #5b5b5b; +} +div.meta { + color: #5b5b5b; +} +div.meta span { + color: #F00; +} +div.privateNote { + font-variant: small-caps; + font-size: small; + text-align: right; +} +li.xfolkentry { + border-bottom: 1px solid #DDD; + margin-bottom: 0; + padding: 1em 0.5em; + overflow: auto; +} +html > body li.xfolkentry { + border-bottom: 1px dotted #AAA; +} +li.xfolkentry div { + padding: 0.1em; +} +li.xfolkentry.deleted { + opacity: 0.5; +} +li.xfolkentry.private { + border-left: 3px solid #F00; +} +li.xfolkentry.shared { + border-left: 3px solid #FA0; +} +li.below-threshold > div { + border-right: 5px dotted #F00; +} + +li.xfolkentry div div.description span.anchorBookmark { + /*font-family:monospace;*/ +} + +/* bookmark voting */ +.vote-badge { + float: left; + width: 3em; + margin: 5px; + border: 1px solid #CCCC88; + font-weight: bold; + /*border-radius: 10px;*/ + -moz-border-radius: 10px; +} +.vote-badge span, .vote-badge a { + display: block; + text-align: center; +} +.vote-badge a:hover { + text-decoration: none; +} +.vote-badge .vote-for { + /*border-top-right-radius: 10px;*/ + /*border-top-left-radius: 10px;*/ + -moz-border-radius-topright: 10px; + -moz-border-radius-topleft: 10px; +} +.vote-badge .vote-against { + /*border-bottom-right-radius: 10px;*/ + /*border-bottom-left-radius: 10px;*/ + -moz-border-radius-bottomright: 10px; + -moz-border-radius-bottomleft: 10px; +} +.vote-badge a.vote-for:hover { + background-color: #ccffbb; +} +.vote-badge a.vote-against:hover { + background-color: #ffcccc; +} +.vote-badge-for .vote-for-inactive { + color: transparent; + background-color: #ccffbb; +} +.vote-badge-against .vote-against-inactive { + color: transparent; + background-color: #ffcccc; +} + +/* bookmark voting horizontal */ +div.vote-horiz .voting { + font-weight: bold; +} +li.xfolkentry div.vote-horiz-for { +/* border-left: 1em solid #ccffbb;*/ +/* padding-left: 0.5em;*/ +} +li.xfolkentry div.vote-horiz-against { +/* border-left: 1em solid #ffcccc;*/ +/* padding-left: 0.5em;*/ +} +.vote-horiz a, .vote-horiz .vote-for-inactive, +.vote-horiz .vote-against-inactive { + padding-left: 1.5em; + margin-left: 0.7em; +} +.vote-horiz a.vote-for:hover { + background-color: #ccffbb; +} +.vote-horiz a.vote-against:hover { + background-color: #ffcccc; +} +.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive { + color: #AAA; +} +.vote-horiz .vote-for { + background: url(images/vote-for.png) no-repeat; +} +.vote-horiz .vote-against { + background: url(images/vote-against.png) no-repeat; +} +.vote-horiz .vote-for-inactive { + background: url(images/vote-for-voted.png) no-repeat; +} +.vote-horiz .vote-against-inactive { + background: url(images/vote-against-voted.png) no-repeat; +} + + +/* SIDEBAR */ + +div#sidebar { + font-size: small; + position: absolute; + right: 1em; + top: 10em; + width: 25%; +} +/* +div#sidebar a { + color: #995; +} +*/ +div#sidebar a:hover { + color: #000; +} +div#sidebar>div { + /*background: #FFF url('images/bg_sidebar.png') bottom repeat-x;*/ + border: 1px solid #000; + color: #555; + margin-bottom: 1em; +} +div#sidebar h2 { + background: transparent; + border: 0; + color: #000000; + letter-spacing: 0; + margin: 0; + padding: 0.5em 0; +} +div#sidebar hr { + display: none; +} +div#sidebar p { + margin: 1em; +} +div#sidebar p.tags a { + margin: 0; +} +div#sidebar table { + margin: 0.5em 0.5em 0 0.5em; +} +div#sidebar table td { + padding-bottom: 0.25em; + padding-right: 0.5em; +} +/* +div#sidebar ul { + list-style-type: none; + margin: 0; + padding: 0.5em; +} +div#sidebar ul li { + margin: 0.5em 0; +}*/ + +div#related { + padding: 0.5em; +} + +.crossTags { + padding:0px 3px; + border: 1px solid #000000; +} + +div#sidebar>div#maintagsmenu { + padding: 0.5em; + border: 5px solid #999955 +} + + + +/* TAGS */ + +p.commondescription { + padding-left:5px; + color: #555; + font-weight: bold; + font-size: medium; + border-left: 1px solid #CC8; + width: 70%; +} + +p.tags { + line-height: 2.25em; + /*margin: 2em 10%;*/ + text-align: justify; + vertical-align: middle; + width: 70%; +} +p.tags a, +p.tags span { + color: #47A; + margin-right: 0.5em; +} +p.tags span:hover { + cursor: pointer; + text-decoration: underline; +} +p.tags span.selected { + background: #CEC; +} + +.anchor { + cursor: pointer; + text-decoration: underline; +} + +.treeTag { + color: #999955; +} +.treeTag:hover { + cursor: pointer; + text-decoration: underline; +} +.treeTag.selected { + background: #CEC; +} + +/* PROFILE */ + +table.profile th { + width: 10em; +} + +table tr.ssl-current td { + background-color: #AFA; +} + +/* OTHER GUFF */ + +dd { + background: #CEC; + border-right: 4px solid #ACA; + color: #464; + padding: 6px; +} +dd a { + color: #464; +} +dd a:hover { + color: #000 !important; + text-decoration: underline !important; +} + +dl { + font-size: small; + margin: 1em; + width: 70%; +} +dl#profile dd { + background: #CDE; + border-color: #ABC; + color: #247; +} +dl#profile dt { + background: #BCE; + border-color: #9AC; + color: #245; + display: block; + font-weight: bold; + padding: 6px; +} +dl#profile a { + color: #446; +} +dl#profile a:hover { + color: #000 !important; + text-decoration: underline !important; +} +dl#meta dd { + line-height: 1.5em; +} +dl#meta dt { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt { + border-right: 4px solid #9B9; +} +dt a { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt a:hover { + background: #ACA; + border: 0; +} +form { + margin: 0; +} +form#search { + margin-right: 0.75em; + color: #CCC; + font-size: small; + float: right; + margin: 0; + position: absolute; + right: 0; + top: 6.4em; +} +form label, +form td, +form th { + font-size: small; +} +form table { + margin: 0 1em; +} +h3 { + background: #DDD; + color: #555; + font-size: small; + letter-spacing: 0.2em; + margin: 2em 1em 1em 1em; + padding: 0.25em 0.75em; +} +li { + font-size: small; + margin-bottom: 0.5em; +} +p { + font-size: small; + margin: 1em; +} +p#sort { + /*color: #CCC;*/ + font-size: small; + /*float: right;*/ + /*margin: 0;*/ + /*position: absolute;*/ + right: 0; + top: 7em; +} +html > body p#sort { + /*margin-right: 0.75em;*/ +} +p#sort a { + background: #AAA; + color: #555; + font-weight: normal; + margin-right: 0.5em; + padding: 0 1em; +} +html > body p#sort a { + margin-right: 0; +} +p#sort a:hover { + background: #CCC; + text-decoration: none !important; +} +p#sort span { + display: none; +} + +p.backToTop{ + text-align:center; +} + +p.paging { + font-size: small; + margin-left: 1em; + text-align:center; +} +p.paging a, +p.paging span.disable { + background: #888; + color: #FFF; + display: inline; + margin-right: 0.5em; + padding: 0.25em 1em; +} +p.paging a:hover { + background: #666; +} +p.paging span { + display: none; +} +p.paging span.disable { + background: #DDD; + color: #AAA; +} +div.collapsible p.tags { + line-height: 2.25em; + margin: 1em 2em; +} +th label { + padding-right: 1em; +} +ul { + margin-right: 1em; + width: 75%; +} + +.adminBackground { + /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/ + /*border-top: 1px solid; + border-color: #CC9900;*/ +} + +.adminBackground { + background: #FFF url('images/bg_admin.png') repeat-y top right; +} + +a.bookmarklet { + padding: 2px; + background-color: #AAFAEE; +} + +/* tree styles */ +#related-content.jstree-default.jstree-focused { + background: none !important; +} + + +/* add/edit bookmark */ +.ui-autocomplete { + width: 458px; +} + +/* Mobile First behavior */ + +#search, #sidebar { + visibility: hidden; + display: none; +} + +ol#bookmarks { + width: 95%; +} + +#welcome { + width: 80%; +} + +@media only screen and (min-width : 800px) { + #search, #sidebar { + visibility: inherit; + display: inherit; + } + + ol#bookmarks { + width: 70%; + } + + #welcome { + width: 66%; + } +} |
